diff --git a/procmgr/main.cpp b/procmgr/main.cpp
index 190c72da4..6aae4cfb6 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -414,7 +414,8 @@ int main(int argc, char** argv)
         }
 
 
-        // This will never work.....
+        // TODO: This is called before MessageThread is created.
+        // Doesn't break anything but can be removed as it's done after MessageThread creation.
         try
         {
             oam.distributeConfigFile();
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index aad0623dc..81887d25c 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -9195,7 +9195,7 @@ int ProcessManager::switchParentOAMModule(std::string newActiveModuleName)
     runStandby = false;
     int retryCount = 0;
     //sleep, give time for message thread to startup
-    while (!MsgThreadActive && retryCount < 5)
+    while (!MsgThreadActive && retryCount < 10)
     {
        log.writeLog(__LINE__, "Waiting for Message Thread...", LOG_TYPE_DEBUG);
        sleep(5);
@@ -10104,7 +10104,7 @@ int ProcessManager::OAMParentModuleChange()
     if ( ( config.ServerInstallType() == oam::INSTALL_COMBINE_DM_UM_PM)  &&
             ( moduleNameList.size() <= 0 && config.moduleType() == "pm") )
     {
-		int status = 0;
+        // Do Nothing
     }
     else
     {