Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa -r2b7580660f89067dd78f91701dbd1a5b71bbdbba
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 2b7580660f89067dd78f91701dbd1a5b71bbdbba)
@@ -652,6 +652,10 @@
         isBloodPumpOn = TRUE;
         result = BLOOD_PUMP_RAMPING_UP_STATE;
     }
+    else
+    {
+        isBloodPumpOn = FALSE;
+    }
 
     return result;
 }
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa -r2b7580660f89067dd78f91701dbd1a5b71bbdbba
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0a61f7fa5ff6945ebc2e507d8ecb71a652c38eaa)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 2b7580660f89067dd78f91701dbd1a5b71bbdbba)
@@ -611,6 +611,10 @@
         releaseDialInPumpStop();
         isDialInPumpOn = TRUE;
         result = DIAL_IN_PUMP_RAMPING_UP_STATE;
+    }
+    else
+    {
+        isDialInPumpOn = FALSE;
     }
 
     return result;
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r2b7580660f89067dd78f91701dbd1a5b71bbdbba
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 2b7580660f89067dd78f91701dbd1a5b71bbdbba)
@@ -665,6 +665,7 @@
     }
     else
     {
+        isDialOutPumpOn = FALSE;
         dialOutPumpPWMDutyCyclePct = 0.0;
     }
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r9d924ec76ce770eb2a94088bfe37bfb0e30981a8 -r2b7580660f89067dd78f91701dbd1a5b71bbdbba
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9d924ec76ce770eb2a94088bfe37bfb0e30981a8)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2b7580660f89067dd78f91701dbd1a5b71bbdbba)
@@ -73,7 +73,7 @@
 {
     ALARM_ID_T  alarmID;                        ///< ID of highest priority alarm in this priority category
     U32         subRank;                        ///< Sub-rank of this alarm
-    U32         timeSinceTriggeredMS;           ///< Time (in ms) since this alarm was triggered
+    S32         timeSinceTriggeredMS;           ///< Time (in ms) since this alarm was triggered
 } ALARM_PRIORITY_RANKS_T;
 
 /// Enumeration of alarm audio self-test states.
@@ -1264,7 +1264,7 @@
     {
         alarmPriorityFIFO[ priority ].alarmID = ALARM_ID_NO_ALARM;
         alarmPriorityFIFO[ priority ].subRank = LOWEST_ALARM_SUB_RANK;
-        alarmPriorityFIFO[ priority ].timeSinceTriggeredMS = 0;
+        alarmPriorityFIFO[ priority ].timeSinceTriggeredMS = -1;
     }
     else
     {