Index: CommBuffers.h
===================================================================
diff -u -rca1d590217b1bfd14f0e0682f88e04de076ff199 -rece40056675b8e5b58b399195e27352458251e91
--- CommBuffers.h	(.../CommBuffers.h)	(revision ca1d590217b1bfd14f0e0682f88e04de076ff199)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision ece40056675b8e5b58b399195e27352458251e91)
@@ -65,6 +65,8 @@
     COMM_BUFFER_OUT_DD_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
     COMM_BUFFER_IN_FP_CAN_PC,                              ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
     COMM_BUFFER_OUT_FP_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
+    COMM_BUFFER_OUT_CAN_DD_2_UI,                           ///< Buffer for outgoing DD to UI messages (channel 40)
+    COMM_BUFFER_IN_CAN_UI_2_DD,                            ///< Buffer for incoming UI to DD messages (channel 41)
 #endif
     NUM_OF_COMM_BUFFERS                                    ///< Number of CAN communication buffers
 } COMM_BUFFER_T;
Index: Integrity.c
===================================================================
diff -u -r9e1286bed0d0c61afd54a3cfeac6ce53c6c96772 -rece40056675b8e5b58b399195e27352458251e91
--- Integrity.c	(.../Integrity.c)	(revision 9e1286bed0d0c61afd54a3cfeac6ce53c6c96772)
+++ Integrity.c	(.../Integrity.c)	(revision ece40056675b8e5b58b399195e27352458251e91)
@@ -4,7 +4,9 @@
 
 #include "reg_tcram.h"
 
+#ifdef _TD_
 #include "CpldInterface.h"
+#endif
 #include "Integrity.h"
 #include "Messaging.h"
 #include "TaskGeneral.h"
@@ -86,7 +88,7 @@
 #ifdef _TD_
                 SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_CPU_RAM_ERROR_STATUS, tcram1ErrStat, tcram2ErrStat );
 #else
-                SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_CPU_RAM_ERROR_STATUS, tcram1ErrStat, tcram2ErrStat );
+                SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_CPU_RAM_ERROR_STATUS, tcram1ErrStat, tcram2ErrStat );
 #endif
                 singleBitRAMErrorFlag = TRUE;
             }
Index: SystemComm.c
===================================================================
diff -u -rca1d590217b1bfd14f0e0682f88e04de076ff199 -rece40056675b8e5b58b399195e27352458251e91
--- SystemComm.c	(.../SystemComm.c)	(revision ca1d590217b1bfd14f0e0682f88e04de076ff199)
+++ SystemComm.c	(.../SystemComm.c)	(revision ece40056675b8e5b58b399195e27352458251e91)
@@ -709,7 +709,8 @@
 #ifdef _DD_
             //TODO : validate code changes
             // Remove message pending ACK from list
-            if ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) )
+            if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) ) &&
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_UI ) ) )
 #endif
             {
                 pendingAckList[ i ].used = FALSE;