Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r72ba5f3c63325b00306b544b2513c03500919d06 -rda1f86ddf735623ba393ca809479157cd66c154c
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 72ba5f3c63325b00306b544b2513c03500919d06)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision da1f86ddf735623ba393ca809479157cd66c154c)
@@ -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"
@@ -170,6 +169,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -180,6 +180,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -213,6 +214,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
@@ -329,7 +331,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
             {