Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r25770b4b27e75e730d89ac046f7db405b1bfe39f -rc20d71064bad67c2db392c6383bb410e8a7dfa2a
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 25770b4b27e75e730d89ac046f7db405b1bfe39f)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c20d71064bad67c2db392c6383bb410e8a7dfa2a)
@@ -326,6 +326,7 @@
 void stopDGHeatDisinfect( void )
 {
     heatDisinfectState = DG_HEAT_DISINFECT_STATE_COMPLETE;
+    resetActuators();
 
     requestNewOperationMode( DG_MODE_STAN );
 }
@@ -464,8 +465,8 @@
     if ( didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C &&
-             getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR ) >  MIN_INLET_CONDUCTIVITY_US_PER_CM )
+        if ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C /*&&
+             getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR ) >  MIN_INLET_CONDUCTIVITY_US_PER_CM*/ )
         {
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
             setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -1175,7 +1176,7 @@
         volume = getLoadCellFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
     }
 
-    if ( volume < RSRVRS_EMPTY_VOL_ML )
+    if ( volume < 450 ) //RSRVRS_EMPTY_VOL_ML )
     {
         rsrvrStatus = TRUE;
         // Set the state timer in case it needs to be used for another timeout check