Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra43996d4383527a14cffe8bc676cccc6bd93c174 -r3e26dba2affe762d5ebad791a51e036bd2aa060a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a43996d4383527a14cffe8bc676cccc6bd93c174)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3e26dba2affe762d5ebad791a51e036bd2aa060a)
@@ -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"
@@ -179,6 +178,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -189,6 +189,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -222,6 +223,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
@@ -338,7 +340,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
             {