diff --git a/lib/Base_Thread.cpp b/lib/Base_Thread.cpp
index e6b41c806..0ce574166 100644
--- a/lib/Base_Thread.cpp
+++ b/lib/Base_Thread.cpp
@@ -17,7 +17,8 @@ template void Base_Thread::ProcessAllMyDS_AfterPoll<MySQL_Thread>();
 template void Base_Thread::ProcessAllMyDS_AfterPoll<PgSQL_Thread>();
 template void Base_Thread::ProcessAllMyDS_BeforePoll<MySQL_Thread>();
 template void Base_Thread::ProcessAllMyDS_BeforePoll<PgSQL_Thread>();
-
+template void Base_Thread::register_session(MySQL_Thread*, MySQL_Session*, bool);
+template void Base_Thread::register_session(PgSQL_Thread*, PgSQL_Session*, bool);
 
 Base_Thread::Base_Thread() {
 };
diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp
index 88ca44213..213bb230b 100644
--- a/lib/ProxySQL_Admin.cpp
+++ b/lib/ProxySQL_Admin.cpp
@@ -3112,6 +3112,13 @@ bool admin_handler_command_load_or_save(char *query_no_space, unsigned int query
 	return true;
 }
 
+// Explicitly instantiate the required template class and member functions
+template void ProxySQL_Admin::send_ok_msg_to_client<MySQL_Session*>(Client_Session<MySQL_Session*>&, char const*, int, char const*);
+template void ProxySQL_Admin::send_ok_msg_to_client<PgSQL_Session*>(Client_Session<PgSQL_Session*>&, char const*, int, char const*);
+template void ProxySQL_Admin::send_error_msg_to_client<MySQL_Session*>(Client_Session<MySQL_Session*>&, char const*, unsigned short);
+template void ProxySQL_Admin::send_error_msg_to_client<PgSQL_Session*>(Client_Session<PgSQL_Session*>&, char const*, unsigned short);
+template int ProxySQL_Admin::FlushDigestTableToDisk<(SERVER_TYPE)0>(SQLite3DB*);
+
 void ProxySQL_Admin::flush_configdb() { // see #923
 	wrlock();
 	admindb->execute((char *)"DETACH DATABASE disk");