diff --git a/mtce/src/common/nodeClass.h b/mtce/src/common/nodeClass.h
index 0e7f0811..75e38694 100755
--- a/mtce/src/common/nodeClass.h
+++ b/mtce/src/common/nodeClass.h
@@ -362,7 +362,7 @@ private:
         bool inservice_failed_subf ;
 
         /** node has reached enabled state this number of times */
-        bool enabled_count ;
+        int enabled_count ;
 
         /** Number of OOS tests run so far */
         int  oos_test_count ;
diff --git a/mtce/src/maintenance/mtcNodeHdlrs.cpp b/mtce/src/maintenance/mtcNodeHdlrs.cpp
index 6aa14f42..22cb2c65 100755
--- a/mtce/src/maintenance/mtcNodeHdlrs.cpp
+++ b/mtce/src/maintenance/mtcNodeHdlrs.cpp
@@ -4612,13 +4612,13 @@ int nodeLinkClass::reboot_handler ( struct nodeLinkClass::node * node_ptr )
                 {
                     if ( !node_ptr->mtcCmd_work_fifo.empty() )
                         node_ptr->mtcCmd_work_fifo.pop_front();
-                        if ( !node_ptr->mtcCmd_work_fifo.empty() )
-                            mtcCmd_workQ_purge ( node_ptr );
+                    if ( !node_ptr->mtcCmd_work_fifo.empty() )
+                        mtcCmd_workQ_purge ( node_ptr );
 
                     if ( !node_ptr->mtcCmd_done_fifo.empty() )
                         node_ptr->mtcCmd_done_fifo.pop_front();
-                        if ( !node_ptr->mtcCmd_done_fifo.empty() )
-                            mtcCmd_doneQ_purge ( node_ptr );
+                    if ( !node_ptr->mtcCmd_done_fifo.empty() )
+                        mtcCmd_doneQ_purge ( node_ptr );
 
                     mtcInvApi_force_task ( node_ptr, "" );
                     adminActionChange ( node_ptr, MTC_ADMIN_ACTION__NONE );