Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra6e1a62344275a14e4edde1bdda9974eef840827 -rdbe4474d0bb8524a9a39bac169244d5cf56641bf
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a6e1a62344275a14e4edde1bdda9974eef840827)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision dbe4474d0bb8524a9a39bac169244d5cf56641bf)
@@ -322,8 +322,8 @@
 {
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_BICARB_PUMP_CHECK;
     DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
-    F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32       bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio +
+    F32 measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
+    F32 bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio +
                                           CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
 #ifndef DISABLE_DIALYSATE_CHECK
     F32 const bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
@@ -470,11 +470,11 @@
  *************************************************************************/
 static DG_FILL_MODE_STATE_T handleDeliverDialysateState( void )
 {
-    F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32 const acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    F32 const dialysateConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-    BOOL const isAcidConductivityOutOfRange = ( acidConductivity <= MIN_ACID_CONCENTRATE_CONDUCTIVITY ) || ( acidConductivity >= MAX_ACID_CONCENTRATE_CONDUCTIVITY );
-    BOOL const isDialysateConductivityOutOfRange = ( dialysateConductivity <= MIN_DIALYSATE_CONDUCTIVITY ) || ( dialysateConductivity >= MAX_DIALYSATE_CONDUCTIVITY );
+    F32  measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
+    F32  acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
+    F32  dialysateConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+    BOOL isAcidConductivityOutOfRange = ( acidConductivity <= MIN_ACID_CONCENTRATE_CONDUCTIVITY ) || ( acidConductivity >= MAX_ACID_CONCENTRATE_CONDUCTIVITY );
+    BOOL isDialysateConductivityOutOfRange = ( dialysateConductivity <= MIN_DIALYSATE_CONDUCTIVITY ) || ( dialysateConductivity >= MAX_DIALYSATE_CONDUCTIVITY );
 
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();