Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r788c0f92052a7d8f0d67dd4ab607b48520013589 -rd182ea22d168c4a6522993f8a0a362586e87e591
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 788c0f92052a7d8f0d67dd4ab607b48520013589)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision d182ea22d168c4a6522993f8a0a362586e87e591)
@@ -465,11 +465,16 @@
         // the electrical connection of THd sensor.
         if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
         {
-            if ( ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex ) || ( TEMPSENSORS_INTERNAL_THD_RTD == sensorIndex ) )
+            if ( TEMPSENSORS_HEAT_DISINFECT == sensorIndex )
             {
                 temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_OUTLET_REDUNDANT ].temperatureValues );
             }
 
+            if ( TEMPSENSORS_INTERNAL_THD_RTD == sensorIndex )
+            {
+                temperature = 40.0F;
+            }
+
             if ( TEMPSENSORS_OUTLET_REDUNDANT == sensorIndex )
             {
                 temperature = getF32OverrideValue( &tempSensors[ TEMPSENSORS_INLET_DIALYSATE ].temperatureValues );
Index: firmware/App/Controllers/UVReactors.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -rd182ea22d168c4a6522993f8a0a362586e87e591
--- firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision d182ea22d168c4a6522993f8a0a362586e87e591)
@@ -433,16 +433,14 @@
             // If the flow is below minimum and the allowed time has elapsed, set the reactor's signal to be low and set its state
             // to be off.
             setReactorEnableStatus( reactor, PIN_SIGNAL_LOW );
-            // The state is directly changed here because the switch state is not changed to be off
-            reactorsStatus[ reactor ].execState = UV_REACTOR_STATE_OFF;
+            state = UV_REACTOR_STATE_OFF;
         }
     }
 
     // Check if it has been requested to turn off a reactor
     if ( TURN_OFF == reactorsStatus[ reactor ].switchState )
     {
         setReactorEnableStatus( reactor, PIN_SIGNAL_LOW );
-
         state = UV_REACTOR_STATE_OFF;
     }
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r98a1a2a624373a1d140daed0136522ab6e635237 -rd182ea22d168c4a6522993f8a0a362586e87e591
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 98a1a2a624373a1d140daed0136522ab6e635237)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision d182ea22d168c4a6522993f8a0a362586e87e591)
@@ -82,7 +82,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. TODO original value was 5 mins
-#define RSRVRS_500ML_FILL_UP_TIMEOUT_MS            ( 4 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoirs 1 & 2 partial fill up timeout in ms. TODO original value was 2 mins
+#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.
 
 // Fill and heat water
@@ -95,7 +95,7 @@
 #define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI       12.0F                                                       ///< Heat disinfect target drain outlet pressure in psi.
 #define HEAT_DISINFECT_TIME_MS                     ( 10 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Heat disinfect time for each section in milliseconds.
 #define HEAT_DISINFECT_START_TEMP_TIMOUT_MS        ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
-#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 0.5F * SEC_PER_MIN * MS_PER_SECOND )                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect. TODO change this to 5 seconds
+#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            100.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
 #define POST_HEAT_DISINFECT_WAIT_TIME_MS           ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect final wait time before flushing the system in milliseconds.
 #define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.