diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp b/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp
index 7e67f50f..6e34d367 100755
--- a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp
+++ b/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeCtrl.cpp
@@ -1248,7 +1248,7 @@ void daemon_service_run ( void )
     }
 #endif
 
-    if ( ts.tv_sec < MTC_MINS_20 )
+    if ( ts.tv_sec < MTC_MINS_15 )
     {
         /* CPE DOR window is much greater in CPE since heartbeat
          * cannot start until the inactive CPE has run both manifests */
diff --git a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp b/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp
index a5316f34..1a3d1c7e 100755
--- a/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp
+++ b/mtce-common/cgts-mtce-common-1.0/maintenance/mtcNodeHdlrs.cpp
@@ -5607,7 +5607,7 @@ int nodeLinkClass::add_handler ( struct nodeLinkClass::node * node_ptr )
                 if ( NOT_THIS_HOST )
                 {
                     if (( LARGE_SYSTEM ) ||
-                        (( CPE_SYSTEM ) && ( is_controller(node_ptr) == false )))
+                        (( CPE_SYSTEM ) && ( this->dor_mode_active == false )))
                     {
                         send_hbs_command ( node_ptr->hostname, MTC_CMD_START_HOST );
                     }