Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r7b74c2bf11c26a510aee4a6045fc0bed6a456401 -r5ea6a78b3576e7f6b456843b31877101f55a7dc3
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7b74c2bf11c26a510aee4a6045fc0bed6a456401)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 5ea6a78b3576e7f6b456843b31877101f55a7dc3)
@@ -1582,7 +1582,7 @@
  * @brief
  * The handleSyringePumpPrimeState function handles the prime state
  * of the syringe pump control state machine.
- * @details Inputs: syringePumpVolumeDelivered.data
+ * @details Inputs: syringePumpVolumeDelivered, syringePumpStateStartTime
  * @details Outputs: Syringe pump ramped up to prime rate, alarm conditions checked
  * @return next state
  *************************************************************************/
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r4d509fa074423027c3106a209ead0beffd57cc3e -r5ea6a78b3576e7f6b456843b31877101f55a7dc3
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 4d509fa074423027c3106a209ead0beffd57cc3e)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5ea6a78b3576e7f6b456843b31877101f55a7dc3)
@@ -277,11 +277,12 @@
     F32 hepRate  = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
     // Do not run syringe pump if no Heparin included in prescription or it was paused or if Heparin should be stopped at this stage of treatment
-    if ( ( minRem > (F32)preStop ) && ( HEPARIN_STATE_STOPPED == currentHeparinState ) )
+    if ( ( minRem > (F32)preStop ) &&
+         ( ( HEPARIN_STATE_STOPPED == currentHeparinState ) || ( HEPARIN_STATE_DISPENSING == currentHeparinState ) ) )
     {
         if ( hepRate > 0.0 )
         {
-            startHeparinContinuous();  // TODO - check return status
+            startHeparinContinuous();
         }
         else
         {
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r6a26a0122d20ec075c3f719d5379583359500d8a -r5ea6a78b3576e7f6b456843b31877101f55a7dc3
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 6a26a0122d20ec075c3f719d5379583359500d8a)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5ea6a78b3576e7f6b456843b31877101f55a7dc3)
@@ -816,7 +816,7 @@
     if ( TRUE == resumeTreatmentAlarmResponseRequest )
     {
         resumeTreatmentAlarmResponseRequest = FALSE;
-        // Hard stop the pumps when recovering from the treatment stop to not start from a high speed
+        // Hard stop the pumps so they will ramp up from zero together on resume
         signalDialInPumpHardStop();
         signalDialOutPumpHardStop();