Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rfba89d67dd2bef913e85a13563e2aa49f0e2e2f5 -r2326a384932d92d970f9ec46c1dc1e8881b8bc8d
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision fba89d67dd2bef913e85a13563e2aa49f0e2e2f5)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 2326a384932d92d970f9ec46c1dc1e8881b8bc8d)
@@ -193,6 +193,7 @@
     roPumpState                       = RO_PUMP_OFF_STATE;
     roPumpControlMode                 = NUM_OF_PUMP_CONTROL_MODES;
     roPumpControlModeSet              = roPumpControlMode;
+    isROPumpOn                        = FALSE;
 }
 
 /*********************************************************************//**
@@ -227,6 +228,7 @@
             // Get the initial guess of the duty cycle
             roPumpPWMDutyCyclePct   = ROP_FLOW_TO_PWM_DC( roFlowRate );
             roControlTimerCounter   = 0;
+            isROPumpOn              = TRUE;
             result = TRUE;
         }
         // Requested max pressure is out of range
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rfba89d67dd2bef913e85a13563e2aa49f0e2e2f5 -r2326a384932d92d970f9ec46c1dc1e8881b8bc8d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision fba89d67dd2bef913e85a13563e2aa49f0e2e2f5)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2326a384932d92d970f9ec46c1dc1e8881b8bc8d)
@@ -1610,9 +1610,9 @@
 
 /*********************************************************************//**
  * @brief
- * The isRsrvrFull function checks whether the target reservoir is full or
- * not. If the fill times out, it sets the state machine to complete and
- * exits the heat disinfect mode.
+ * The getRsrvrFillStatus function checks whether the target reservoir
+ * is full or not. If the fill times out, it sets the state machine to
+ * complete and exits the heat disinfect mode.
  * @details Inputs: rsrvrFillStableTimeCounter, alarm, stateTimer
  * @details Outputs: none
  * @param r is DG_RESERVOIR_1 or DG_RESERVOIR_2
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rf4a72f36d8b6ddfc36b987b0a64144b37b8df061 -r2326a384932d92d970f9ec46c1dc1e8881b8bc8d
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f4a72f36d8b6ddfc36b987b0a64144b37b8df061)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2326a384932d92d970f9ec46c1dc1e8881b8bc8d)
@@ -49,17 +49,17 @@
  *************************************************************************/
 void initAlarmMgmt( void )
 {
-    ALARM_ID_T a;
+    ALARM_ID_T alrm;
 
     // initialize alarm states and start time stamps
-    for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ )
+    for ( alrm = ALARM_ID_NO_ALARM; alrm < NUM_OF_ALARM_IDS; alrm++ )
     {
-        alarmIsActive[ a ].data = FALSE;
-        alarmIsActive[ a ].ovData = FALSE;
-        alarmIsActive[ a ].ovInitData = TRUE;
-        alarmIsActive[ a ].override = OVERRIDE_RESET;
+        alarmIsActive[ alrm ].data = FALSE;
+        alarmIsActive[ alrm ].ovData = FALSE;
+        alarmIsActive[ alrm ].ovInitData = TRUE;
+        alarmIsActive[ alrm ].override = OVERRIDE_RESET;
 
-        alarmConditionIsActive[ a ] = FALSE;
+        alarmConditionIsActive[ alrm ] = FALSE;
     }
 }