Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r2e21405574597474db0ebae86cdd7fa2d517f71c -re6c4c61c793a91f9ed9dfe969e01bdeee565347d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2e21405574597474db0ebae86cdd7fa2d517f71c)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e6c4c61c793a91f9ed9dfe969e01bdeee565347d)
@@ -168,21 +168,21 @@
     fillState                     = DG_FILL_MODE_STATE_START;
     dialysateFillStartTime        = 0;
     dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
-    reservoirBaseWeight           = 0.0;
-    integratedVolumeML            = 0.0;
+    reservoirBaseWeight           = 0.0F;
+    integratedVolumeML            = 0.0F;
     concentrateTestStartTime      = 0;
-    acidConductivityTotal         = 0.0;
-    bicarbConductivityTotal       = 0.0;
+    acidConductivityTotal         = 0.0F;
+    bicarbConductivityTotal       = 0.0F;
     conductivitySampleCount       = 0;
     concentratePumpPrimeCount     = 0;
     pumpSpeedIndex                = 0;
-    averageBicarbConductivity     = 0.0;
-    averageAcidConductivity       = 0.0;
-    pctDiffInConductivity         = 0.0;
+    averageBicarbConductivity     = 0.0F;
+    averageAcidConductivity       = 0.0F;
+    pctDiffInConductivity         = 0.0F;
     bicarbConductivitySampleCount = 0;
     acidConductivitySampleCount   = 0;
-    totalBicarbConductivity       = 0.0;
-    totalAcidConductivity         = 0.0;
+    totalBicarbConductivity       = 0.0F;
+    totalAcidConductivity         = 0.0F;
     havePauseActuatorsBeenSet     = FALSE;
 
     initPersistentAlarm( ALARM_ID_DG_DIALYSATE_TEMPERATURE_SENSORS_OUT_OF_RANGE, 0, DIALYSATE_TEMP_SNSRS_OUT_OF_RANGE_TIMEOUT_MS );
@@ -333,16 +333,10 @@
  *************************************************************************/
 void resetFillStatusParameters( void )
 {
-    DG_HEATERS_RECORD_T heaterInfo;
-
-    // Get the heaters info from the NV data management. Do not alarm on the status of the data since it has already been checked in NV POST
-    getNVRecord2Driver( GET_INF_HEATERS_RECORD, (U08*)&heaterInfo, sizeof( DG_HEATERS_RECORD_T ), 0, ALARM_ID_NO_ALARM );
-
-    // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
-    fillStatus.fillFlowRateAverageLPM    = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
-    fillStatus.fillFlowRateRunningSum    = 0.0;
+    fillStatus.fillFlowRateAverageLPM    = getTargetROPumpFlowRateLPM();
+    fillStatus.fillFlowRateRunningSum    = 0.0F;
     fillStatus.fillSampleCounter         = 0;
-    fillStatus.fillTemperatureRunningSum = 0.0;
+    fillStatus.fillTemperatureRunningSum = 0.0F;
     // At the beginning the last and average temperatures are considered as the trimmer heater target temperature which
     // is the dialysate temperature
     fillStatus.fillTemperatureAverage = getHeaterTargetTemperature( DG_TRIMMER_HEATER );
@@ -821,8 +815,8 @@
         // Get the last fill temperature before leaving to Generation Idle
         fillStatus.fillFlowRateAverageLPM    = fillStatus.fillFlowRateRunningSum / (F32)fillStatus.fillSampleCounter;
         fillStatus.fillTemperatureAverage    = fillStatus.fillTemperatureRunningSum / (F32)fillStatus.fillSampleCounter;
-        fillStatus.fillFlowRateRunningSum    = 0.0;
-        fillStatus.fillTemperatureRunningSum = 0.0;
+        fillStatus.fillFlowRateRunningSum    = 0.0F;
+        fillStatus.fillTemperatureRunningSum = 0.0F;
         fillStatus.fillSampleCounter         = 0;
         fillStatus.fillLastTemperature       = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );