Index: firmware/App/Common.h
===================================================================
diff -u -r5217f70ca5c74bd586dc14540e6404b43feea004 -r620033425435de1fab63396301aa2404a49f8777
--- firmware/App/Common.h	(.../Common.h)	(revision 5217f70ca5c74bd586dc14540e6404b43feea004)
+++ firmware/App/Common.h	(.../Common.h)	(revision 620033425435de1fab63396301aa2404a49f8777)
@@ -24,7 +24,7 @@
 #ifndef _VECTORCAST_
 //    #define RM46_EVAL_BOARD_TARGET      1
 //    #define SIMULATE_UI                 1
-//    #define DEBUG_ENABLED               1
+    #define DEBUG_ENABLED               1
 
     #ifdef DEBUG_ENABLED
         #include <stdio.h>
Index: firmware/App/Drivers/Comm.c
===================================================================
diff -u -r31f710004436c030e787c895980457e08577702d -r620033425435de1fab63396301aa2404a49f8777
--- firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 31f710004436c030e787c895980457e08577702d)
+++ firmware/App/Drivers/Comm.c	(.../Comm.c)	(revision 620033425435de1fab63396301aa2404a49f8777)
@@ -26,8 +26,8 @@
 
 // ********** private data **********
 
-static BOOL canXmitsInProgress = FALSE;
-static BOOL uartXmitsInProgress = FALSE;
+static volatile BOOL canXmitsInProgress = FALSE;
+static volatile BOOL uartXmitsInProgress = FALSE;
 
 /*************************************************************************
  * @brief signalCANXmitsInitiated
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r5217f70ca5c74bd586dc14540e6404b43feea004 -r620033425435de1fab63396301aa2404a49f8777
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 5217f70ca5c74bd586dc14540e6404b43feea004)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 620033425435de1fab63396301aa2404a49f8777)
@@ -114,16 +114,16 @@
             // adjust buffer count per this data add (also reserves space to add data before releasing thread protection)
             commBufferByteCount[ buffer ][ activeBuffer ] += len;
             // release thread protection
-            _enable_IRQ();
             bufferGetLock[ buffer ] = FALSE;
+            _enable_IRQ();
             // data successfully added to buffer
             result = TRUE;
         }
         else // buffer too full to add this much data
         {
             // release thread protection
-            _enable_IRQ();
             bufferGetLock[ buffer ] = FALSE;
+            _enable_IRQ();
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
         }
     }
Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r941afbaab7fc86f40fa49f9d110d481f65b44b68 -r620033425435de1fab63396301aa2404a49f8777
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 941afbaab7fc86f40fa49f9d110d481f65b44b68)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 620033425435de1fab63396301aa2404a49f8777)
@@ -57,8 +57,6 @@
                 if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) )
                 {
                     activateAlarmNoData( ALARM_ID_UI_COMM_POST_FAILED );
-                    activateSafetyShutdown(); // TODO - for now, possibly remove later
-                    //checkInFromUI();  // pretend we got something from UI to unlock task processing of HD
                 }
             }
         }