Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r3840d6eb8a915ca594ff4db3c4eb2b68a9d30984 -r9baf80d73b3009d70e155f81fac781cb11ebf655
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 3840d6eb8a915ca594ff4db3c4eb2b68a9d30984)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 9baf80d73b3009d70e155f81fac781cb11ebf655)
@@ -1183,8 +1183,8 @@
     BOOL isTDiTempAboveDialysateTarget = ( dgDialysateTemp >= TDiHigh ? TRUE : FALSE );
     F32 TDiLow                         = dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_TOL_C;
     BOOL isTDiTempBelowDialysateTarget = ( dgDialysateTemp <= TDiLow ? TRUE : FALSE );
-    BOOL isTempBelowTrigger            = isTDITempBelowLowSafety | isTDiTempBelowDialysateTarget;
-    BOOL isTempAboveTrigger            = isTDiTempAboveLowSafety | isTDiTempAboveDialysateTarget;
+    BOOL isTempBelowTrigger            = (BOOL)( isTDITempBelowLowSafety || isTDiTempBelowDialysateTarget );
+    BOOL isTempAboveTrigger            = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget );
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DIALYSATE_TEMP_CHECK ) != SW_CONFIG_ENABLE_VALUE )
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -r9baf80d73b3009d70e155f81fac781cb11ebf655
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9baf80d73b3009d70e155f81fac781cb11ebf655)
@@ -1243,7 +1243,7 @@
 {
     ALARM_ID_T a = alarmStatus.alarmTop;
 
-    for ( a = ALARM_ID_HD_SOFTWARE_FAULT; a < NUM_OF_ALARM_IDS; a++ )
+    for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
     {
         // Is alarm recoverable?
         if ( FALSE == ALARM_TABLE[ a ].alarmNoClear )