Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r696e732c9742535a58b9c65f243df7cd797d1423 -r20535cdea80fac7a48eb84d47c9ec4a1968051c5
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 696e732c9742535a58b9c65f243df7cd797d1423)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 20535cdea80fac7a48eb84d47c9ec4a1968051c5)
@@ -197,12 +197,8 @@
  *************************************************************************/
 U32 transitionToFillMode( void )
 {
-    DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
-
     initFillMode();
 
-    reservoirBaseWeight = getReservoirWeight( inactiveReservoir );
-
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
@@ -711,6 +707,7 @@
     {
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
+        reservoirBaseWeight        = getReservoirWeight( getInactiveReservoir() );
         dialysateFillStartTime     = getMSTimerCount();
         fillStatus.isThisFirstFill = FALSE;
         result                     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
@@ -747,7 +744,7 @@
     // Set concentrate pumps speed based on the RO pump flow rate
     handleDialysateMixing( getMeasuredFlowRateLPM( RO_FLOW_SENSOR ) * ML_PER_LITER, acidMix, bicarbMix );
 
-    integratedVolumeML      += getMeasuredROFlowRateWithConcPumpsLPM() * ( (F32)TASK_GENERAL_INTERVAL / (F32)( SEC_PER_MIN ) );
+    integratedVolumeML      += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
     usedAcidVolumeML.data   += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
     usedBicarbVolumeML.data += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) * FLOW_INTEGRATOR;
     acidConductivityTotal   += acidConductivity;