Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d -r8074ecece0b11532c173ad951a98036f0c54ca52
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
@@ -329,7 +329,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
             {
@@ -344,8 +344,14 @@
         }
         else
         {
-            checkPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, FALSE, 0.0, 0.0 );
-            checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, FALSE, 0.0, 0.0 );
+            if ( DG_PRIMARY_HEATER == heater )
+            {
+                checkPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, FALSE, 0.0, 0.0 );
+            }
+            else
+            {
+                checkPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, FALSE, 0.0, 0.0 );
+            }
         }
     }
 
@@ -838,9 +844,9 @@
     {
         HEATERS_DATA_T data;
 
-        data.mainPrimayHeaterDC     = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0;
         // The duty cycle of the primary heater is divided into 2 parts and is applied to main
         // and small primary heaters. So they are always the same.
+        data.mainPrimayHeaterDC     = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0;
         data.smallPrimaryHeaterDC   = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle * 100.0;
         data.trimmerHeaterDC        = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle * 100.0;
         data.primaryTargetTemp      = heatersStatus[ DG_PRIMARY_HEATER ].targetTemp;