Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r49533d4870aa10c1b20406dd5c013567fe854694 -rdbf9c245d46c7536c72d277da24f7b44d7a84118
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 49533d4870aa10c1b20406dd5c013567fe854694)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision dbf9c245d46c7536c72d277da24f7b44d7a84118)
@@ -492,12 +492,9 @@
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
         {
-            heparinDeliveryState = HEPARIN_STATE_STOPPED;
-            if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
-            {
-                syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
-                syringePumpRetractRequested = TRUE;
-            }
+            heparinDeliveryState        = HEPARIN_STATE_STOPPED;
+            syringePumpSetRate          = SYRINGE_PUMP_RETRACT_RATE;
+            syringePumpRetractRequested = TRUE;
         }
     }
 
@@ -571,6 +568,10 @@
     // If valid to start a bolus, kick it off
     if ( FALSE == isSyringePumpHome() )
     {
+        if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+        {
+            heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        }
         if ( ( TRUE == isSyringeDetected() ) && ( TRUE == syringePumpPrimeCompleted ) &&
              ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( HEPARIN_STATE_STOPPED == heparinDeliveryState ) )
         {
@@ -586,6 +587,7 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
+
     }
 
     return syringePumpBolusRequested;
@@ -1790,9 +1792,9 @@
     syringePumpRampTimerCtr++;
     if ( syringePumpRampUpToggleTime > syringePumpSetToggleTime )
     {
-        syringePumpRampUpToggleTime = (U32)((F32)SYRINGE_PUMP_START_RAMP_SPEED /
-                                            (F32)( ( syringePumpRampTimerCtr * syringePumpRampTimerCtr * syringePumpRampTimerCtr ) / SYRINGE_PUMP_RAMP_DIVISOR ) );
-        syringePumpRampUpPct = syringePumpSetToggleTime / syringePumpRampUpToggleTime;
+        syringePumpRampUpToggleTime = (U32)( (F32)SYRINGE_PUMP_START_RAMP_SPEED /
+                                             ( (F32)( syringePumpRampTimerCtr * syringePumpRampTimerCtr * syringePumpRampTimerCtr ) / (F32)SYRINGE_PUMP_RAMP_DIVISOR ) );
+        syringePumpRampUpPct = (F32)syringePumpSetToggleTime / (F32)syringePumpRampUpToggleTime;
         if ( syringePumpRampUpToggleTime > syringePumpSetToggleTime )
         {
             setFPGASyringePumpStepToggleTime( syringePumpRampUpToggleTime );