Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra7a7874f47ccddc122af67273851881477880ff9 -rd0c73712d9a955b8189e2d45b22f36af71806c03
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a7a7874f47ccddc122af67273851881477880ff9)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d0c73712d9a955b8189e2d45b22f36af71806c03)
@@ -778,12 +778,13 @@
         fillStatus.fillTemperatureAverage    = fillStatus.fillTemperatureRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillFlowRateRunningSum    = 0.0;
         fillStatus.fillTemperatureRunningSum = 0.0;
-        fillStatus.fillSampleCounter         = 1;
+        fillStatus.fillSampleCounter         = 0;
         fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
 
+        calculateHeaterEstimationGain( DG_PRIMARY_HEATER );
+
         // Write the latest fill data into the RTC RAM for heaters control
-        // TODO test this and make sure it is writing it correctly
-        setFillInfoToRTCRAM();   // SRSDG ???
+        // setFillInfoToRTCRAM(); // TODO we do not need to write to NV memory for now
 
         requestNewOperationMode( DG_MODE_GENE );
     }
@@ -922,6 +923,9 @@
     acidCP1PumpFlowRate   = MIN( acidCP1PumpFlowRate, CONCENTRATE_PUMP_MAX_SPEED );
     bicarbCP2PumpFlowRate = MIN( bicarbCP2PumpFlowRate, CONCENTRATE_PUMP_MAX_SPEED );
 
+    acidCP1PumpFlowRate   = MAX( acidCP1PumpFlowRate, 0.0F );
+    bicarbCP2PumpFlowRate = MAX( bicarbCP2PumpFlowRate, 0.0F );
+
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, acidCP1PumpFlowRate );
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, bicarbCP2PumpFlowRate );
 }