Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r0589a145e2830f5e3b853489911a6ce7306ffdd9
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0589a145e2830f5e3b853489911a6ce7306ffdd9)
@@ -1273,7 +1273,7 @@
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
     // Retrieve blood flow sensor calibration data and check for sensor connected status
-    if ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() )
+    if ( BFM_SENSOR_PARAM_CORRUPT_STATUS != bfmStatus )
     {
         bloodFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain;
         bloodFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r0589a145e2830f5e3b853489911a6ce7306ffdd9
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0589a145e2830f5e3b853489911a6ce7306ffdd9)
@@ -1230,7 +1230,8 @@
     // Get the flow sensors calibration record
     HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
-    if (  DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() )
+    // Retrieve dialysate flow sensor calibration data
+    if ( DFM_SENSOR_PARAM_CORRUPT_STATUS != dfmStatus )
     {
         dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
         dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r0589a145e2830f5e3b853489911a6ce7306ffdd9
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0589a145e2830f5e3b853489911a6ce7306ffdd9)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "AlarmMgmt.h"
+#include "Buttons.h"
 #include "ConsumableSelfTest.h"
 #include "FPGA.h"
 #include "ModePreTreat.h"
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r62200ed6423dfd6ff7881bd0fc308162384e663e -r0589a145e2830f5e3b853489911a6ce7306ffdd9
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 62200ed6423dfd6ff7881bd0fc308162384e663e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 0589a145e2830f5e3b853489911a6ce7306ffdd9)
@@ -834,10 +834,6 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {