diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index a3ec91cce19..b3e6eb0dc6a 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
@@ -5004,6 +5004,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
       setApiConTimer(apiConnectptr.i, ctcTimer, __LINE__);
       if (isIndexOp) {
         jam();
+	regApiPtr->lqhkeyreqrec--; // Compensate for extra during read
 	tcKeyRef->connectPtr = indexOp;
 	EXECUTE_DIRECT(DBTC, GSN_TCKEYREF, signal, TcKeyRef::SignalLength);
       } else {
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index 9e39452891f..94603ddbe77 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -312,12 +312,10 @@ static bool
 readLocalConfig(){
   // Read local config file
   LocalConfig lc;
-  int nodeid = lc.init(glob.local_config_filename);
-  if(nodeid == -1){
+  if(!lc.init(glob.local_config_filename))
     return false;
-  }
   
-  glob.localNodeId = nodeid;
+  glob.localNodeId = lc._ownNodeId;
   return true;
 }
 
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index f9d441ab352..b0ef8219fdf 100644
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
@@ -22,7 +22,7 @@
 #include <NdbSleep.h>
 #include <getarg.h>
 #include <kernel/ndb_limits.h>
-#include "../src/common/mgmcommon/LocalConfig.hpp"
+#include "../include/mgmcommon/LocalConfig.hpp"
 
 #include <NDBT.hpp>
 
@@ -67,13 +67,13 @@ int main(int argc, const char** argv){
       return NDBT_ProgramExit(NDBT_FAILED);
     }
 
-    for (int i = 0; i<lcfg.items; i++)
+    for (int i = 0; i<lcfg.ids.size();i++)
     {
-      MgmtSrvrId * m = lcfg.ids[i];
+      MgmtSrvrId * m = &lcfg.ids[i];
       
       switch(m->type){
       case MgmId_TCP:
-	snprintf(buf, 255, "%s:%d", m->data.tcp.remoteHost, m->data.tcp.port);
+	snprintf(buf, 255, "%s:%d", m->name.c_str(), m->port);
 	_hostName = buf;
 	break;
       case MgmId_File: