Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r6a4bdeb4743eab20c2eaf7bcc08738d24c830001 -r98d81183a0783497cf5717ef34aa5e862136a790
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 6a4bdeb4743eab20c2eaf7bcc08738d24c830001)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 98d81183a0783497cf5717ef34aa5e862136a790)
@@ -522,7 +522,6 @@
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VRD1, VALVE_STATE_OPEN );
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
-            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
             // Assume reservoir 1 is full and drain it
@@ -1121,6 +1120,7 @@
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD2, VALVE_STATE_CLOSED );
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
             turnOffUVReactor( INLET_UV_REACTOR );
             turnOffUVReactor( OUTLET_UV_REACTOR );
             signalROPumpHardStop();
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r51d67532a86df4c88bebe57d224a9c81c029c08b -r98d81183a0783497cf5717ef34aa5e862136a790
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 51d67532a86df4c88bebe57d224a9c81c029c08b)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 98d81183a0783497cf5717ef34aa5e862136a790)
@@ -78,7 +78,7 @@
 #define RSRVRS_PARTIAL_FILL_VOL_ML                 500.0F                                                      ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT              ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )           ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                  ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 full fill up timeout in ms.
-#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 4 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms.
+#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms.
 #define RSRVRS_DRAIN_TIMEOUT_MS                    ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 drain timeout in ms.
 
 // Target temperature