Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r971fc9950b919f8b54ff88a627f6cb1e8a0906ee -r68b2e13b6cd3e91c6ef91e2d47c0613cb2ab96ef
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 971fc9950b919f8b54ff88a627f6cb1e8a0906ee)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 68b2e13b6cd3e91c6ef91e2d47c0613cb2ab96ef)
@@ -30,7 +30,6 @@
 #include "OperationModes.h"
 #include "PersistentAlarm.h"
 #include "Reservoirs.h"
-#include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
@@ -344,7 +343,7 @@
             {
                 alarm    = ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON;
                 measFlow = getMeasuredFlowRateLPM( RO_FLOW_SENSOR );
-                minFlow  = MIN_RO_FLOWRATE_LPM;
+                minFlow  = MIN_RO_HEATER_FLOWRATE_LPM;
             }
             else
             {
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r7f38146626e566ac94d97d785af7290529992fdd -r68b2e13b6cd3e91c6ef91e2d47c0613cb2ab96ef
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 7f38146626e566ac94d97d785af7290529992fdd)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 68b2e13b6cd3e91c6ef91e2d47c0613cb2ab96ef)
@@ -64,7 +64,7 @@
 
 // Flush drain path state defines
 #define FLUSH_DRAIN_WAIT_TIME_MS                   ( SEC_PER_MIN * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds.
-#define MIN_INLET_TEMPERATURE_C                    15.0F                                                       ///< Minimum water inlet temperature in C.      TODO original temperature was 25 C
+#define MIN_INLET_TEMPERATURE_C                    25.0F                                                       ///< Minimum water inlet temperature in C.
 #define MAX_INLET_CONDUCTIVITY_US_PER_CM           2000.0F                                                     ///< Maximum water inlet conductivity in us/cm
 
 // Flush circulation path state defines
@@ -628,7 +628,7 @@
         BOOL hasConductivityPassed = FALSE;
 
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
+        if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) >= MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
             hasConductivityPassed = TRUE;
@@ -1961,11 +1961,11 @@
 
     // Check if the temperature gradient in between the coldest and the hottest spot is more than the specified temperature and
     // the timer has not started yet, start it
-    if ( ( TPoTemp - ThdTemp > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) && ( 0 == tempGradOutOfRangeTimer ) )
+    if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) && ( 0 == tempGradOutOfRangeTimer ) )
     {
         tempGradOutOfRangeTimer = getMSTimerCount();
     }
-    else if ( ( TPoTemp - ThdTemp > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) &&
+    else if ( ( fabs( TPoTemp - ThdTemp ) > HEAT_DISINFECT_MAX_TEMP_GRADIENT_C ) &&
               ( TRUE == didTimeout( tempGradOutOfRangeTimer, HEAT_DISINFECT_TEMP_GRAD_OUT_RANGE_TIME_MS ) ) )
     {
         alarmDetectedPendingTrigger = ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE;