diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 624f0a132a3..587d5a7572d 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2835,7 +2835,7 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value,
     
     p_type++;
     if(iter.get(param, &val_64) == 0){
-      val_64 = atoll(value);
+      val_64 = strtoll(value, 0, 10);
       break;
     }
     p_type++;
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/ndb/src/ndbapi/NdbScanOperation.cpp
index 7d51974da7c..428c6c8ebc8 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/ndb/src/ndbapi/NdbScanOperation.cpp
@@ -661,8 +661,6 @@ NdbScanOperation::doSend(int ProcessorId)
 
 void NdbScanOperation::closeScan()
 {
-  int self = pthread_self() ;
-
   if(m_transConnection) do {
     if(DEBUG_NEXT_RESULT)
       ndbout_c("closeScan() theError.code = %d "
diff --git a/ndb/test/ndbapi/testIndex.cpp b/ndb/test/ndbapi/testIndex.cpp
index 1241f09fc45..a0844cee8f8 100644
--- a/ndb/test/ndbapi/testIndex.cpp
+++ b/ndb/test/ndbapi/testIndex.cpp
@@ -1529,4 +1529,4 @@ int main(int argc, const char** argv){
   return testIndex.execute(argc, argv);
 }
 
-
+template class Vector<Attrib*>;
diff --git a/ndb/test/ndbapi/testNdbApi.cpp b/ndb/test/ndbapi/testNdbApi.cpp
index 2e08ebbed4e..5b171d42578 100644
--- a/ndb/test/ndbapi/testNdbApi.cpp
+++ b/ndb/test/ndbapi/testNdbApi.cpp
@@ -1010,4 +1010,5 @@ int main(int argc, const char** argv){
   return testNdbApi.execute(argc, argv);
 }
 
-
+template class Vector<Ndb*>;
+template class Vector<NdbConnection*>;
diff --git a/ndb/test/ndbapi/testRestartGci.cpp b/ndb/test/ndbapi/testRestartGci.cpp
index e3dd1f8e2ce..54d38654ff2 100644
--- a/ndb/test/ndbapi/testRestartGci.cpp
+++ b/ndb/test/ndbapi/testRestartGci.cpp
@@ -216,3 +216,5 @@ NDBT_TESTSUITE_END(testRestartGci);
 int main(int argc, const char** argv){
   return testRestartGci.execute(argc, argv);
 }
+
+template class Vector<SavedRecord>;
diff --git a/ndb/test/ndbapi/testScan.cpp b/ndb/test/ndbapi/testScan.cpp
index 3da0ceb6d8c..3d8b37df0ca 100644
--- a/ndb/test/ndbapi/testScan.cpp
+++ b/ndb/test/ndbapi/testScan.cpp
@@ -1404,3 +1404,4 @@ int main(int argc, const char** argv){
   return testScan.execute(argc, argv);
 }
 
+template class Vector<Attrib*>;
diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp
index 90e14a39296..9d20da8c1f9 100644
--- a/ndb/test/run-test/main.cpp
+++ b/ndb/test/run-test/main.cpp
@@ -988,3 +988,7 @@ setup_hosts(atrt_config& config){
 }
 
 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/HugoOperations.cpp b/ndb/test/src/HugoOperations.cpp
index d8e733f6142..7c05cb86a93 100644
--- a/ndb/test/src/HugoOperations.cpp
+++ b/ndb/test/src/HugoOperations.cpp
@@ -796,3 +796,5 @@ HugoOperations::scanReadRecords(Ndb* pNdb, NdbScanOperation::LockMode lm,
   
   return 0;
 }
+
+template class Vector<HugoOperations::RsPair>;
diff --git a/ndb/test/tools/cpcc.cpp b/ndb/test/tools/cpcc.cpp
index 488bd812681..e1468df3290 100644
--- a/ndb/test/tools/cpcc.cpp
+++ b/ndb/test/tools/cpcc.cpp
@@ -348,3 +348,5 @@ Operate::evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & pp){
 }
 
 template class Vector<const ParserRow<SimpleCpcClient::ParserDummy>*>;
+template class Vector<Expression*>;
+template class Vector<SimpleCpcClient*>;