Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r13bbbcdddc3a6f884ca69cc6bd650b6765576de2 -r9bb662bfd053fa114ac47224db7825c85bb6d796
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 13bbbcdddc3a6f884ca69cc6bd650b6765576de2)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 9bb662bfd053fa114ac47224db7825c85bb6d796)
@@ -898,9 +898,9 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        U32 const bpPressure = getMeasuredBloodPumpOcclusion();
-        F32 const arterialPressure = getFilteredArterialPressure();
-        F32 const venousPressure = getFilteredVenousPressure();
+        U32 bpPressure = getMeasuredBloodPumpOcclusion();
+        F32 arterialPressure = getFilteredArterialPressure();
+        F32 venousPressure = getFilteredVenousPressure();
 
         if ( bpPressure > CARTRIDGE_LOADED_THRESHOLD )
         {
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r41eaf78372c0ee2a79b38d0a06bd3f02d54baed4 -r9bb662bfd053fa114ac47224db7825c85bb6d796
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 41eaf78372c0ee2a79b38d0a06bd3f02d54baed4)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 9bb662bfd053fa114ac47224db7825c85bb6d796)
@@ -1472,7 +1472,7 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ULTRAFILTRATION_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_UF_RATE_TOO_HIGH_ERROR, uFMeasRate );
+            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_UF_RATE_ERROR, uFMeasRate );
         }
     }
     SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_RSRVR_UF_VOLUME_AND_TIME, uFResVolumeInMl, resUFTimeInMin )
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6f0304ba16597df68b05fb2af2d1a45b6c43b0ca -r9bb662bfd053fa114ac47224db7825c85bb6d796
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6f0304ba16597df68b05fb2af2d1a45b6c43b0ca)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9bb662bfd053fa114ac47224db7825c85bb6d796)
@@ -1548,8 +1548,6 @@
     {
         if ( FALSE == checkForPrimeOcclusion() )  // transition to complete state only when occlusion is removed
         {
-            // clear the occlusion alarm condition to allow user to resume
-            clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION );  // Resume option will appear
             state = DRY_SELF_TESTS_COMPLETE_STATE;
         }
     }
@@ -1729,7 +1727,7 @@
         else
         {
 #ifndef _RELEASE_
-            if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE ) )
+            if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) ) )
             {
                 state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
             }