Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9051b47d2d0e9f112d4ebc310a5572844b7528f4 -r9848d793638e2f613678e60ea7c0f1e7bc31d9eb
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9051b47d2d0e9f112d4ebc310a5572844b7528f4)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9848d793638e2f613678e60ea7c0f1e7bc31d9eb)
@@ -498,12 +498,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;
         }
     }
 
@@ -1818,9 +1815,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 );