Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r33c3a81272ce8c9bae64ae20537e9be45b11edd0 -re83374c507e06265cfeb3ad6c96f6175f4cebfd7
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 33c3a81272ce8c9bae64ae20537e9be45b11edd0)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision e83374c507e06265cfeb3ad6c96f6175f4cebfd7)
@@ -212,13 +212,7 @@
     presOcclDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     presOcclState                       = PRESSURE_WAIT_FOR_POST_STATE;
     presOcclPostState                   = PRESSURE_SELF_TEST_STATE_START;
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRESSURE_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        bloodPumpOcclusionAfterCartridgeInstall = 0;
-    }
+    bloodPumpOcclusionAfterCartridgeInstall = 0;
 }
 
 /*********************************************************************//**
@@ -635,7 +629,7 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
@@ -649,7 +643,7 @@
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
                 {
                     signalBloodPumpHardStop();  // Stop pump immediately
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_OCCLUSION_BLOOD_PUMP, bpOccl, OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall )
                 }
             }
         }
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -re83374c507e06265cfeb3ad6c96f6175f4cebfd7
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e83374c507e06265cfeb3ad6c96f6175f4cebfd7)
@@ -1521,8 +1521,8 @@
         syringePumpVolumeStartPosition = pos;
         syringePumpPreLoadCompleted = FALSE;
 
-        // Check estimated syringe volume needed for treatment vs. volume detected - if insufficient for treatment needs, alarm
-        if ( syringeVol >= txVolume )
+        // Check estimated syringe volume needed for treatment vs. volume detected - if insufficient for treatment needs, alarm (check only applies in pre-tx mode)
+        if ( ( syringeVol >= txVolume ) || ( getCurrentOperationMode() != MODE_PRET ) )
         {
             syringePumpPlungerFound = TRUE;
             syringeVolumeAdequate = TRUE;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8f0292d944c1796f8f246bec5692a9b295be3ac2 -re83374c507e06265cfeb3ad6c96f6175f4cebfd7
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8f0292d944c1796f8f246bec5692a9b295be3ac2)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e83374c507e06265cfeb3ad6c96f6175f4cebfd7)
@@ -871,7 +871,7 @@
  * @brief
  * The handlePatientConnectionState function handles patient connection state
  * during pre-treatment mode.
- * @details Inputs: none
+ * @details Inputs: alarmActionResumeReceived
  * @details Outputs: requested mode transition to treatment mode
  * @return current state (sub-mode)
  *************************************************************************/