diff --git a/ndb/src/kernel/main.cpp b/ndb/src/kernel/main.cpp
index 24cb1820575..e68ef089498 100644
--- a/ndb/src/kernel/main.cpp
+++ b/ndb/src/kernel/main.cpp
@@ -250,14 +250,13 @@ systemInfo(const Configuration & config, const LogLevel & logLevel){
 
 }
 
-static void
-handler_register(int signum, sighandler_t handler, bool ignore)
-{
-  if (ignore) {
-    if(signum != SIGCHLD)
-      signal(signum, SIG_IGN);
-  } else
-    signal(signum, handler);
+#define handler_register(signum, handler, ignore)\
+{\
+  if (ignore) {\
+    if(signum != SIGCHLD)\
+      signal(signum, SIG_IGN);\
+  } else\
+    signal(signum, handler);\
 }
 
 void 
diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp
index 9d20da8c1f9..6f1899fdbe2 100644
--- a/ndb/test/run-test/main.cpp
+++ b/ndb/test/run-test/main.cpp
@@ -987,8 +987,6 @@ setup_hosts(atrt_config& config){
   return true;
 }
 
-template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;
-template class Vector<SimpleCpcClient::Process>;
 template class Vector<Vector<SimpleCpcClient::Process> >;
 template class Vector<atrt_host>;
 template class Vector<atrt_process>;
diff --git a/ndb/test/src/NDBT_Test.cpp b/ndb/test/src/NDBT_Test.cpp
index a93c85d3bbe..b1691c379a9 100644
--- a/ndb/test/src/NDBT_Test.cpp
+++ b/ndb/test/src/NDBT_Test.cpp
@@ -1138,4 +1138,3 @@ template class Vector<NDBT_Verifier*>;
 template class Vector<NDBT_Initializer*>;
 template class Vector<NDBT_Finalizer*>;
 template class Vector<const NdbDictionary::Table*>;
-template class Vector<int>;
diff --git a/ndb/test/tools/cpcc.cpp b/ndb/test/tools/cpcc.cpp
index e1468df3290..e30d458ffee 100644
--- a/ndb/test/tools/cpcc.cpp
+++ b/ndb/test/tools/cpcc.cpp
@@ -347,6 +347,5 @@ Operate::evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & pp){
   return true;
 }
 
-template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;
 template class Vector<Expression*>;
 template class Vector<SimpleCpcClient*>;