Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r4e6093159809ef2ddc39d88401390caebe7fa293 -rafe402337b84d8843c6ab544643fc403cb382c43
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision afe402337b84d8843c6ab544643fc403cb382c43)
@@ -296,15 +296,8 @@
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
     syringePumpVolumeRequired = 0.0;
-
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
-        syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
-    }
-
+    syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
+    syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
     syringePumpDataPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
     syringePumpSpeedCalcTimerCounter = 0;
     syringePumpRampTimerCtr = 0;
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r4e6093159809ef2ddc39d88401390caebe7fa293 -rafe402337b84d8843c6ab544643fc403cb382c43
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision afe402337b84d8843c6ab544643fc403cb382c43)
@@ -963,10 +963,10 @@
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_ALARM_AUDIO ) )
             {
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
-                    setAlarmAudioState( ALARM_PRIORITY_HIGH,
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
-                                ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_AUDIO_INVALID_ALARM_STATE, alarmStatus.alarmsState )
+                setAlarmAudioState( ALARM_PRIORITY_HIGH,
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_GAIN],
+                                    ALARM_AUDIO_DIVIDER_LOOKUP_TABLE[volume][ALARM_AUDIO_VOLUME_DIVIDER] );
             }
 
             else