Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0 -r1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1)
@@ -1064,7 +1064,9 @@
         if ( lastBloodPumpDirectionCount != dirErrorCnt )
         {
             lastBloodPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_BLOOD_PUMP )
+#endif
         }
 
         bpMCDir = ( getMeasuredBloodPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0 -r1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1)
@@ -1048,7 +1048,9 @@
         if ( lastDialInPumpDirectionCount != dirErrorCnt )
         {
             lastDialInPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_INLET_PUMP )
+#endif
         }
 
         dipMCDir = ( getMeasuredDialInPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0 -r1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1)
@@ -803,7 +803,9 @@
         if ( lastDialOutPumpDirectionCount != dirErrorCnt )
         {
             lastDialOutPumpDirectionCount = dirErrorCnt;
+#ifndef DISABLE_PUMP_DIRECTION_CHECKS
             SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR, (U32)HD_PUMP_DIALYSATE_OUTLET_PUMP )
+#endif
         }
 
         dopMCDir = ( getMeasuredDialOutPumpMCSpeed() >= 0.0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0 -r1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 1407db067ff2910ba9ad30b69a08bbd2f0b4f3a1)
@@ -176,6 +176,10 @@
             postState = handlePOSTStatus( testStatus );
             break;
 
+        case POST_STATE_SYRINGE_PUMP:
+            postState = POST_STATE_ALARM_AUDIO;
+            break;
+
         case POST_STATE_ALARM_AUDIO:
 #ifdef DONT_SKIP_NV_POST
             // Skip the rest of the POSTs