diff --git a/dbcon/joblist/tupleaggregatestep.cpp b/dbcon/joblist/tupleaggregatestep.cpp
index 19514b0a0..cbf762458 100644
--- a/dbcon/joblist/tupleaggregatestep.cpp
+++ b/dbcon/joblist/tupleaggregatestep.cpp
@@ -80,7 +80,7 @@ namespace
 struct cmpTuple
 {
     bool operator()(boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > a,
-                    boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > b)
+                    boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > b) const
     {
         uint32_t keya = boost::get<0>(a);
         uint32_t keyb = boost::get<0>(b);
@@ -2199,7 +2199,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
             if (aggOp == ROWAGG_MULTI_PARM)
             {
                 // Duplicate detection doesn't work for multi-parm`
-                
+
                 // If this function was earlier detected as a duplicate, unduplicate it.
                 SP_ROWAGG_FUNC_t funct = functionVec2.back();
                 if (funct->fAggFunction == ROWAGG_DUP_FUNCT)
@@ -4490,7 +4490,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
         uint64_t outIdx = 0;
         RowAggFunctionType prevAggOp = ROWAGG_FUNCT_UNDEFINE;
         uint32_t prevRetKey = 0;
-        
+
         for (uint64_t i = 0; i < returnedColVec.size(); i++)
         {
             pUDAFFunc = NULL;
@@ -4504,7 +4504,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
             if (aggOp == ROWAGG_MULTI_PARM)
             {
                 // Duplicate detection doesn't work for multi-parm`
-                
+
                 // If this function was earlier detected as a duplicate, unduplicate it.
                 SP_ROWAGG_FUNC_t funct = functionVecUm.back();
                 if (funct->fAggFunction == ROWAGG_DUP_FUNCT)
diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp
index 70c7349bb..330571536 100644
--- a/primitives/blockcache/iomanager.cpp
+++ b/primitives/blockcache/iomanager.cpp
@@ -261,7 +261,7 @@ typedef FdCountEntry FdCountEntry_t;
 
 struct fdCountCompare
 {
-    bool operator() (const FdCountEntry_t& lhs, const FdCountEntry_t& rhs)
+    bool operator() (const FdCountEntry_t& lhs, const FdCountEntry_t& rhs) const
     {
         return lhs.cnt > rhs.cnt;
     }
diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index abf6c42e4..cf8802df9 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
           std::string configFilePathOld = std::string(MCSSYSCONFDIR) + std::string("/columnstore/Columnstore.xml");
           std::string configFilePathNew = std::string(MCSSYSCONFDIR) + std::string("/columnstore/Columnstore.xml.new");
           sysConfigOld = Config::makeConfig(configFilePathOld);          // system version
-          sysConfigNew = Config::makeConfig(configFilePathNew);  // released version    
+          sysConfigNew = Config::makeConfig(configFilePathNew);  // released version
     }
     catch (...)
     {
@@ -322,7 +322,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     { }
-                          
+
     //setup HA IP Address
     string HA_IPadd;
 
@@ -1033,13 +1033,11 @@ int main(int argc, char* argv[])
                 if ( moduleName == systemParentOAMModuleName )
                     sysConfigNew->setConfig(dbrmMainProc, "IPAddr", moduleIPAddr);
 
-                //if ( moduleDisableState == oam::ENABLEDSTATE )
-                //{
-                    DBRMworkernodeID++;
-                    string DBRMSection = dbrmSubProc + oam.itoa(DBRMworkernodeID);
-                    sysConfigNew->setConfig(DBRMSection, "IPAddr", moduleIPAddr);
-                    sysConfigNew->setConfig(DBRMSection, "Module", moduleName);
-                //}
+                DBRMworkernodeID++;
+                string DBRMSection = dbrmSubProc + oam.itoa(DBRMworkernodeID);
+                sysConfigNew->setConfig(DBRMSection, "IPAddr", moduleIPAddr);
+                sysConfigNew->setConfig(DBRMSection, "Module", moduleName);
+
             } //end of nicID loop
 
             //set dbroot assigments
@@ -1789,7 +1787,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     {}
-    
+
     string SystemTempFileDir;
 
     try
@@ -1896,7 +1894,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     {}
-    
+
 
     // add entries from tuning guide
 
@@ -1926,7 +1924,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     {}
-    
+
     // ExeMgr Optional settings
     try
     {
@@ -1949,7 +1947,7 @@ int main(int argc, char* argv[])
         {
             sysConfigNew->setConfig("ExeMgr1", "SecondsBetweenMemChecks", secondsBetweenMemChecks);
         }
-        
+
         maxPct = sysConfigOld->getConfig("ExeMgr1", "MaxPct");
         if ( !maxPct.empty() )
         {
@@ -1964,7 +1962,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     {}
-    
+
     // PrimProc optional parameters
     // Max percent of total memory used by everything before we kill the current query
     // For 5.6.1, this setting uses the same mechanism that ExeMgr uses to kill itself
@@ -1979,7 +1977,7 @@ int main(int argc, char* argv[])
     }
     catch (...)
     {}
- 
+
     //Write out Updated System Configuration File
     sysConfigNew->write();
 }