Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r166097c99fbbe8d7a73a357891409a430178b7f4 -r581064e4188c15307a70bc4265974d61dea23ff8
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 166097c99fbbe8d7a73a357891409a430178b7f4)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 581064e4188c15307a70bc4265974d61dea23ff8)
@@ -54,7 +54,7 @@
 #define RO_PUMP_800_ML_PER_MIN                          800.0F                                               ///< RO pump speed of 800.0 mL/minute.
 #define TARGET_RO_FLOW_RATE_IN_PAUSE_L                    0.8F                                               ///< Target flow rate for RO pump during pause in liters.
 #define MILLILITERS_PER_LITER                           1000.0F                                              ///< One liter is 1000 milliliters
-#define ACID_PUMP_23_ML_PER_MIN                         22.7F //23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
+#define ACID_PUMP_23_ML_PER_MIN                         22.5F //23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
 #define BICARB_PUMP_40_ML_PER_MIN                       40.0F                                                ///< Bicarb pump speed of 40.0 mL/minute.
 #define CONCENTRATE_PUMP_40_ML_PER_MIN                  40.0F                                                ///< Concentrate pump speed of 40.0 mL/minute.
 
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r84989e158824d6cc8d8747ca80c6419315cc951c -r581064e4188c15307a70bc4265974d61dea23ff8
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 84989e158824d6cc8d8747ca80c6419315cc951c)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 581064e4188c15307a70bc4265974d61dea23ff8)
@@ -175,7 +175,8 @@
         getNVRecord2Driver( GET_CAL_HEATING_RECORD, (U08*)&heatingConstsCalRecord, sizeof( heatingConstsCalRecord ),
                             NUM_OF_CAL_DATA_RSRVRS, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD );
 
-        getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ), 0, ALARM_ID_NO_ALARM );
+        getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ),
+                            NUM_OF_ACID_TYPE, ALARM_ID_DG_FILL_CONDUCTIVITIES_INVALID_CAL_RECORD );
     }
 
     // If the mode is fault or it is standby and the RO volume has not been written already, write it
@@ -225,7 +226,8 @@
     calStatus |= getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
                                      NUM_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
 
-    calStatus |= getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ), 0, ALARM_ID_NO_ALARM );
+    calStatus |= getNVRecord2Driver( GET_CAL_FILL_CONDUCTIVITIES_RECORD, (U08*)&fillCondCalRecord, sizeof( fillCondCalRecord ),
+                                     NUM_OF_ACID_TYPE, ALARM_ID_DG_FILL_CONDUCTIVITIES_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {