Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r99291dfcff27720fde696dfe4d262dc003d85d1a -rfba3daf7d2ab628bf90da7504b38d0b03f9e0bd9
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 99291dfcff27720fde696dfe4d262dc003d85d1a)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision fba3daf7d2ab628bf90da7504b38d0b03f9e0bd9)
@@ -948,8 +948,8 @@
  * @brief
  * The checkDialysateTemperature function checks the dialysate temperature
  * reported by DG and alarm if temperature is out of range.
- * @details Inputs: dgTrimmerTempSet, dgDialysateTemp, dgRedundantDialysateTemp
- * @details Outputs: alarm if dialysate temperature is out of accepted range
+ * @details Inputs: dgTrimmerTempSet, dgDialysateTemp
+ * @details Outputs: none
  * @return none
  *************************************************************************/
 void checkDialysateTemperature( void )
@@ -966,7 +966,7 @@
 #endif
     {
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_HIGH_SAFETY_RANGE, isTDiTempAboveHighSafety, dgDialysateTemp, DIALYSATE_TEMP_HIGH_SAFETY_LIMIT_C );
-        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE, isTDiTempAboveLowSafety, dgDialysateTemp, DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C );
+        checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_OUT_OF_LOW_SAFETY_RANGE,  isTDiTempAboveLowSafety,  dgDialysateTemp, DIALYSATE_TEMP_LOW_SAFETY_LIMIT_C );
 
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTDiTempAboveDialysateTarget, dgDialysateTemp, TDiHigh );
         checkPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTDiTempBelowDialysateTarget, dgDialysateTemp, TDiLow );
Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc20c77ef196a760a7642d2426e509995e4a98e01 -rfba3daf7d2ab628bf90da7504b38d0b03f9e0bd9
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c20c77ef196a760a7642d2426e509995e4a98e01)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision fba3daf7d2ab628bf90da7504b38d0b03f9e0bd9)
@@ -38,12 +38,12 @@
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
-      #define DISABLE_BATT_COMM               1           // Disable battery communication  // TODO soft switch
+//      #define DISABLE_BATT_COMM               1           // Disable battery communication  // TODO soft switch
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
-      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
-      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
+//      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
+//      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
       // TODO stays as a build switch until the calibration structure is updated with the build
       #define SKIP_CAL_CHECK                  1           // Implement software configuration
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc20c77ef196a760a7642d2426e509995e4a98e01 -rfba3daf7d2ab628bf90da7504b38d0b03f9e0bd9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c20c77ef196a760a7642d2426e509995e4a98e01)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fba3daf7d2ab628bf90da7504b38d0b03f9e0bd9)
@@ -2266,7 +2266,6 @@
 {
     BOOL result;
     MESSAGE_T msg;
-    U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
Index: firmware/source/sys_main.c
===================================================================
diff -u -r43e59e505bbea87c76822c51a3273eec3f4addaa -rfba3daf7d2ab628bf90da7504b38d0b03f9e0bd9
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 43e59e505bbea87c76822c51a3273eec3f4addaa)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision fba3daf7d2ab628bf90da7504b38d0b03f9e0bd9)
@@ -174,6 +174,7 @@
  *************************************************************************/
 static void initSoftware( void )
 {
+    initSemaphores();
     // Initialize ms timer counter
     initTimers();
     // Initialize alarm manager