Index: AlarmMgmt.c
===================================================================
diff -u -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f -r722e82fef4304c492a37a0330cd80cb5946e57ca
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 722e82fef4304c492a37a0330cd80cb5946e57ca)
@@ -83,10 +83,10 @@
     else
     {
 #ifdef _TD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _DD_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
 #ifdef _RO_
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
Index: CommBuffers.h
===================================================================
diff -u -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f -r722e82fef4304c492a37a0330cd80cb5946e57ca
--- CommBuffers.h	(.../CommBuffers.h)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 722e82fef4304c492a37a0330cd80cb5946e57ca)
@@ -35,31 +35,31 @@
 {
     COMM_BUFFER_NOT_USED = 0,                              ///< CAN message boxes start at 1 so we will not use this buffer
 #ifdef _TD_
-    COMM_BUFFER_OUT_CAN_TD_ALARM,                          ///< Buffer for outgoing TD alarm messages
-    COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages
-    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
-    COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
-    COMM_BUFFER_OUT_CAN_TD_2_DD,                           ///< Buffer for outgoing TD to DD messages
-    COMM_BUFFER_IN_CAN_DD_2_TD,                            ///< Buffer for incoming DD to HD messages
-    COMM_BUFFER_OUT_CAN_TD_2_UI,                           ///< Buffer for outgoing TD to UI messages
+    COMM_BUFFER_OUT_CAN_TD_ALARM,                          ///< Buffer for outgoing TD alarm messages
+    COMM_BUFFER_IN_CAN_DD_ALARM,                           ///< Buffer for incoming DD alarm messages
+    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
+    COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
+    COMM_BUFFER_OUT_CAN_TD_2_DD,                           ///< Buffer for outgoing TD to DD messages
+    COMM_BUFFER_IN_CAN_DD_2_TD,                            ///< Buffer for incoming DD to HD messages
+    COMM_BUFFER_OUT_CAN_TD_2_UI,                           ///< Buffer for outgoing TD to UI messages
     COMM_BUFFER_IN_CAN_UI_2_TD,                            ///< Buffer for incoming UI to TD messages
-    COMM_BUFFER_OUT_CAN_TD_BROADCAST,                      ///< Buffer for outgoing TD broadcast messages
-    COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
+    COMM_BUFFER_OUT_CAN_TD_BROADCAST,                      ///< Buffer for outgoing TD broadcast messages
+    COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages
+    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
 #endif
 #ifdef _DD_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages
-    COMM_BUFFER_IN_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages
-    COMM_BUFFER_OUT_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
+    COMM_BUFFER_OUT_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages
+    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages
     COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages
     COMM_BUFFER_IN_CAN_TD_2_DD,                            ///< Buffer for incoming TD to DD messages
     COMM_BUFFER_OUT_CAN_DD_2_TD,                           ///< Buffer for outgoing DD to TD messages
-    COMM_BUFFER_IN_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages
-    COMM_BUFFER_OUT_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages
+    COMM_BUFFER_OUT_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages
+    COMM_BUFFER_IN_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages
     COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                      ///< Buffer for outgoing DD broadcast messages
-    COMM_BUFFER_OUT_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
+    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages
 #endif
 #ifdef _RO_
Index: SystemComm.c
===================================================================
diff -u -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f -r722e82fef4304c492a37a0330cd80cb5946e57ca
--- SystemComm.c	(.../SystemComm.c)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
+++ SystemComm.c	(.../SystemComm.c)	(revision 722e82fef4304c492a37a0330cd80cb5946e57ca)
@@ -718,8 +718,7 @@
 #ifdef _RO_
             // TODO : clean up required
             // Remove message pending ACK from list
-            if ( /*( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_UI ) ) && */
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_RO_2_DD ) ) )
+            if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_RO_2_DD ) ) )
 #endif
             {
                 pendingAckList[ i ].used = FALSE;
Index: WatchdogMgmt.c
===================================================================
diff -u -rb16fb44ffe64e6ceb3e182d11485c3bb75dbad8f -r722e82fef4304c492a37a0330cd80cb5946e57ca
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b16fb44ffe64e6ceb3e182d11485c3bb75dbad8f)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 722e82fef4304c492a37a0330cd80cb5946e57ca)
@@ -153,7 +153,7 @@
 #endif
 #ifdef _RO_
     // Check to see if watchdog has expired or safety shutdown feedback does not match s/w command (only after POST completed)
-    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != MODE_INIT ) )
+    if ( ( safetyShutdownSoftwareCmd != safetyShutdownFeedbackSignal ) && ( getCurrentOperationMode() != RO_MODE_INIT ) )
 #endif
     {
         if ( ( PIN_SIGNAL_LOW == safetyShutdownFeedbackSignal ) || ( TRUE == didTimeout( safetyShutdownFeedbackMismatchTS, MAX_SAFETY_SHUTDOWN_MISMATCH_MS ) ) )