Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r3a10a015545b7adb9c207423742fb33dfd59fabd -rb07b1a4480583d607bd6ba878cbf2edc5fd4054e
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 3a10a015545b7adb9c207423742fb33dfd59fabd)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision b07b1a4480583d607bd6ba878cbf2edc5fd4054e)
@@ -114,7 +114,7 @@
 static DG_FLUSH_STATE_T handleFlushModeComplete( void );
 
 static void failFlushMode( void );
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, bool resetStateTimer S);
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, BOOL resetStateTimer );
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout );
 static void publishFlushData( void );
 static void monitorModeFlush( void );
@@ -615,7 +615,7 @@
     // If reservoir 1 is empty, turn off the drain pump
     if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
     {
-        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS, FALSE);
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_DRAIN_TIMEOUT_MS);
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
     {
@@ -941,7 +941,7 @@
  * @param timeout is the fill up time out that is checked against
  * @return the status of the reservoirs during filling
  *************************************************************************/
-static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, bool resetStateTimer = TRUE)
+static DG_RESERVOIR_STATUS_T getRsrvrFillStatus( DG_RESERVOIR_ID_T r, F32 targetVol, U32 timeout, BOOL resetStateTimer = TRUE)
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_BELOW_TARGET;
     F32 volume = 0.0;
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -rb07b1a4480583d607bd6ba878cbf2edc5fd4054e
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision b07b1a4480583d607bd6ba878cbf2edc5fd4054e)
@@ -505,7 +505,6 @@
             setValveState( VPI, VALVE_STATE_OPEN );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
             setValveState( VRD1, VALVE_STATE_CLOSED );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -534,6 +533,8 @@
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
+
         // Start the timer
         stateTimer = getMSTimerCount();
     }
@@ -588,6 +589,7 @@
             stateTimer = getMSTimerCount();
             state = DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN;
         }
+        setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
@@ -1587,7 +1589,7 @@
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+            setValveState( VPO, VALVE_STATE_FILL_C_TO_NC);
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_OPEN );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );