Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -recd93a26667363e9664bdc81af777c22125596ee -re654b368ff8f4d194678db88f1cda57b04e7d947
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision ecd93a26667363e9664bdc81af777c22125596ee)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision e654b368ff8f4d194678db88f1cda57b04e7d947)
@@ -68,7 +68,7 @@
 static U32 timeStartMS = 0; // TODO is this needed?
 
 // DG sensor data
-static F32 dgDialysateTemp;                                     ///< Dialysate temperature reported by the DG.
+static F32 dgDialysateTemp = 0.0;                               ///< Dialysate temperature reported by the DG.
 static F32 dgRedundantDialysateTemp = 0.0;                      ///< Redundant dialysate temperature reported by the DG.
 static F32 dgPrimaryTemp = 0.0;                                 ///< Latest RO water temperature reported by the DG.
 static F32 dgTrimmerTempSet = 0.0;                              ///< Trimmer heater target temperature commanded.
@@ -129,6 +129,7 @@
     dgStarted = FALSE;
     dgTrimmerHeaterOn = FALSE;
     dgTrimmerTempSet = 0.0;
+    dgDialysateTemp = 0.0;
     dgActiveReservoirSet = DG_RESERVOIR_2;
     dgReservoirFillVolumeTargetSet = 0;
     dgReservoirDrainVolumeTargetSet = 0;
@@ -1012,7 +1013,7 @@
  *************************************************************************/
 void checkDialysateTemperature( void )
 {
-    /*BOOL const dialysateHighTemp = ( ( ( dgDialysateTemp - dgTrimmerTempSet ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
+    BOOL const dialysateHighTemp = ( ( ( dgDialysateTemp - dgTrimmerTempSet ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
                                      ( dgDialysateTemp > DIALYSATE_TEMP_HIGH_LIMIT_C ) );
 
     BOOL const dialysateLowTemp = ( ( ( dgTrimmerTempSet - dgDialysateTemp ) > DIALYSATE_TEMP_TOLERANCE_C ) ||
@@ -1043,7 +1044,7 @@
         {
             clearAlarmCondition( ALARM_ID_DIALYSATE_TEMPERATURE_LOW );
         }
-    }*/
+    }
 }
 
 // ********** private functions **********
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -re54806da466a8c52e19fd272356dbbfde04171fd -re654b368ff8f4d194678db88f1cda57b04e7d947
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision e54806da466a8c52e19fd272356dbbfde04171fd)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision e654b368ff8f4d194678db88f1cda57b04e7d947)
@@ -283,7 +283,6 @@
     BOOL isTempOutOfRange = FALSE;
     F32 temperature       = 0.0;
     U32 lastFaultSensor   = 0;
-    F32 faultSensorTemp   = 0.0;
 
     for ( sensor = THERMISTOR_ONBOARD_NTC; sensor < NUM_OF_TEMPERATURES; sensor++ )
     {
@@ -298,7 +297,7 @@
 
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, isTempOutOfRange ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, lastFaultSensor, faultSensorTemp );
+        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, lastFaultSensor );
     }
 }
 
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -re54806da466a8c52e19fd272356dbbfde04171fd -re654b368ff8f4d194678db88f1cda57b04e7d947
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision e54806da466a8c52e19fd272356dbbfde04171fd)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision e654b368ff8f4d194678db88f1cda57b04e7d947)
@@ -500,7 +500,7 @@
 
     if ( TRUE == didTimeout( purgeAirTimeOutStartTime, PURGE_AIR_TIME_OUT_COUNT ) )
     {
-        activateAlarmNoData( ALARM_ID_HD_PRIME_SALINE_PURGE_AIR_TIME_OUT );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PRIME_SALINE_PURGE_AIR_TIME_OUT, PURGE_AIR_TIME_OUT_COUNT );
     }
 
     if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
@@ -734,7 +734,7 @@
 
     if ( TRUE == didTimeout( primeSalineDialyzerStartTime, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT ) )
     {
-         activateAlarmNoData( ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT ); // Trigger HD prime saline dialyzer time out alarm.
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_SALINE_DIALYZER_TIME_OUT, PRIME_SALINE_DIALYZER_TIME_OUT_COUNT );  // Trigger HD prime saline dialyzer time out alarm.
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rdbdd97d883c75351fb316ac61911e189986f911e -re654b368ff8f4d194678db88f1cda57b04e7d947
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision dbdd97d883c75351fb316ac61911e189986f911e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e654b368ff8f4d194678db88f1cda57b04e7d947)
@@ -44,8 +44,6 @@
 #include "HDDefs.h"
 #include "TaskPriority.h"
 
-#include "TaskPriority.h"
-
 /**
  *  @addtogroup SystemCommMessages
  *  @{