Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -rdc5fda9a9930d6e1a33c4da0b509b3545acb947d -r946f42bfd6606dd3d771d9a4a7b50e5678469f62
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision dc5fda9a9930d6e1a33c4da0b509b3545acb947d)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
@@ -204,23 +204,13 @@
                     case TREATMENT_BLOOD_PRIME_STATE:
                     case TREATMENT_DIALYSIS_STATE:
                     case TREATMENT_END_STATE:
-                        // TODO: Enable if ADA is ever used to detect air bubble on arterial line during treatment
-                        //if ( bubble == ADA )
-                        //{
-                        //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
-                        //}
                         if ( bubble == ADV )
                         {
                             activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
                         }
                         break;
 
                     case TREATMENT_RINSEBACK_STATE:
-                        // TODO: Enable if ADA is ever used to detect air bubble on arterial line during rinseback
-                        //if ( bubble == ADA )
-                        //{
-                        //    activateAlarmNoData( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED_RINSEBACK );
-                        //}
                         if ( bubble == ADV )
                         {
                             activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
@@ -235,11 +225,6 @@
         }
         else // Air bubble not detected
         {
-            if ( bubble == ADA )
-            {
-                clearAlarmCondition( ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED );
-            }
-
             if ( bubble == ADV )
             {
                 clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r25a6eff69c9371f7a320751adf5359aaf070e5b0 -r946f42bfd6606dd3d771d9a4a7b50e5678469f62
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 25a6eff69c9371f7a320751adf5359aaf070e5b0)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
@@ -460,7 +460,7 @@
 {
     F32 artPres = getFilteredArterialPressure();
 
-#ifndef DISABLE_PRESSURE_CHECKS
+#ifndef DISABLE_ARTERIAL_PRESSURE_CHECK
     // Check arterial pressure is in range
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE,
                                              ( artPres > ARTERIAL_PRESSURE_MAX_MMHG || artPres < ARTERIAL_PRESSURE_MIN_MMHG ) ) )
@@ -505,15 +505,15 @@
 {
     F32 venPres = getFilteredVenousPressure();
 
-#ifndef DISABLE_PRESSURE_CHECKS
-    // Check arterial pressure is in range
+#ifndef DISABLE_VENOUS_PRESSURE_CHECK
+    // Check venous pressure is in range
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres > VENOUS_PRESSURE_MAX_MMHG ) ||
          TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres < VENOUS_PRESSURE_MIN_MMHG ) )
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, venPres );
     }
 
-    // Check arterial pressure during treatment mode
+    // Check venous pressure during treatment mode
     if ( ( MODE_TREA == getCurrentOperationMode() ) && ( getTreatmentState() <= TREATMENT_DIALYSIS_STATE ) )
     {
         F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9ac7866cce73b5281c34626ab5903409778e2b19 -r946f42bfd6606dd3d771d9a4a7b50e5678469f62
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9ac7866cce73b5281c34626ab5903409778e2b19)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
@@ -69,7 +69,7 @@
 
 #define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           2000                                  ///< Alarm persistence period (in ms) for syringe pump speed check alarms.
 #define SYRINGE_PUMP_DIR_ALARM_PERSISTENCE            1000                                  ///< Alarm persistence period (in ms) for syringe pump direction check alarms.
-#define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            500                                   ///< Alarm persistence period (in ms) for syringe pump off check alarms.
+#define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            1000                                  ///< Alarm persistence period (in ms) for syringe pump off check alarms.
 #define SYRINGE_PUMP_OCCLUSION_ALARM_PERSISTENCE      30                                    ///< Alarm persistence period (in ms) for syringe pump occlusion alarms.
 #define SYRINGE_PUMP_ADC_READ_PERSISTENCE             100                                   ///< Syringe pump ADC stale read alarm persistence time (in ms).
 
Index: firmware/App/HDCommon.h
===================================================================
diff -u -rebb4b203609fa7da7137c346c832bd3d0cd54a99 -r946f42bfd6606dd3d771d9a4a7b50e5678469f62
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ebb4b203609fa7da7137c346c832bd3d0cd54a99)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 946f42bfd6606dd3d771d9a4a7b50e5678469f62)
@@ -57,6 +57,8 @@
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
+    #define DISABLE_ARTERIAL_PRESSURE_CHECK 1           // Do not error on arterial pressure out of range
+    #define DISABLE_VENOUS_PRESSURE_CHECK   1           // Do not error on venous pressure out of range
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
 //    #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position