Index: AlarmMgmt.c
===================================================================
diff -u -r91cff0134623a852aeb37b497b2263cf4a9ba6cb -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 91cff0134623a852aeb37b497b2263cf4a9ba6cb)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7)
@@ -83,13 +83,13 @@
     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 );
+       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
     }
 
Index: SystemComm.c
===================================================================
diff -u -r91cff0134623a852aeb37b497b2263cf4a9ba6cb -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7
--- SystemComm.c	(.../SystemComm.c)	(revision 91cff0134623a852aeb37b497b2263cf4a9ba6cb)
+++ SystemComm.c	(.../SystemComm.c)	(revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7)
@@ -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_TD_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 -r91cff0134623a852aeb37b497b2263cf4a9ba6cb -r4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7
--- WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 91cff0134623a852aeb37b497b2263cf4a9ba6cb)
+++ WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4e16a1c22b73b14cfd62cce4f07a1b9086c55dd7)
@@ -24,7 +24,8 @@
 #include "SafetyShutdown.h"
 #endif
 #ifdef _RO_
-#include "FpgaRo.h"
+#include "FpgaRO.h"
+#include "SafetyShutdown.h"
 #endif
 //#include "InternalADC.h"
 #include "Messaging.h"
@@ -124,18 +125,22 @@
 // TODO : clean up once we get the clarity
     PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
 #endif
-    PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd    = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH );
-
-    // Called by background task, so give bg task credit for checking in
-    checkInWithWatchdogMgmt( TASK_BG );
-
-    // Check to see if all monitored tasks have checked in
-    allTasksCheckedIn = haveAllTasksCheckedIn();
-
-    // If all monitored tasks checked in, pet watchdog and clear the slate
-    if ( ( TRUE == allTasksCheckedIn ) && ( TRUE == didTimeout( lastWatchdogPetTime, MIN_WATCHDOG_PET_INTERVAL_MS ) ) )
-    {
-        petWatchdog();
+#ifdef _RO_
+// TODO : clean up once we get the clarity
+    PIN_SIGNAL_STATE_T safetyShutdownFeedbackSignal = PIN_SIGNAL_HIGH;
+#endif
+    PIN_SIGNAL_STATE_T safetyShutdownSoftwareCmd    = ( TRUE == isSafetyShutdownActivated() ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH );
+
+    // Called by background task, so give bg task credit for checking in
+    checkInWithWatchdogMgmt( TASK_BG );
+
+    // Check to see if all monitored tasks have checked in
+    allTasksCheckedIn = haveAllTasksCheckedIn();
+
+    // If all monitored tasks checked in, pet watchdog and clear the slate
+    if ( ( TRUE == allTasksCheckedIn ) && ( TRUE == didTimeout( lastWatchdogPetTime, MIN_WATCHDOG_PET_INTERVAL_MS ) ) )
+    {
+        petWatchdog();
         resetWDTaskCheckIns();
     }
 #ifdef _TD_