Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r62ac3a90e1a370a6423379360651d221eabf3bb2
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 62ac3a90e1a370a6423379360651d221eabf3bb2)
@@ -429,7 +429,12 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
+#ifndef ALWAYS_ALLOW_SYRINGE_PUMP_CMDS
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+#else
+    heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
+#endif
     {
         syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
         syringePumpRetractRequested = TRUE;
@@ -825,11 +830,13 @@
 
     if ( syringePumpDACVrefWriteInProgress != TRUE )
     {
+#ifndef USING_DEBUGGER
         // Check ADC read is fresh
-        if ( lastSyringePumpADCReadCtr == adcReadCtr )  // TODO - add persistence
+        if ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == adcReadCtr ) ) // TODO - add persistence or time window
         {
-            // activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );  // TODO - restore when issue with read counter resolved
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
         }
+#endif
         lastSyringePumpADCReadCtr = adcReadCtr;
 
         //  Check encoder direction error.  // TODO check direction in states