Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r1a9ff89cf0693fb20f24c5fa47a1cc8bc23f3b38 -r84e9f64deaf7df4a652c240a062dc7692283ad44
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 1a9ff89cf0693fb20f24c5fa47a1cc8bc23f3b38)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 84e9f64deaf7df4a652c240a062dc7692283ad44)
@@ -129,7 +129,6 @@
     totalAdditionalRinsebackVolume_mL = 0.0;
     rinsebackAdditionalTimerCtr = 0;
     rinsebackPublishTimerCtr = 0;
-    rinsebackTargetVolume_mL = DEFAULT_RINSEBACK_VOLUME_ML;
     resetRinsebackFlags();
 }
 
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r8d44b80febc4574ce8f9adf91d04a6056c9de42e -r84e9f64deaf7df4a652c240a062dc7692283ad44
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 8d44b80febc4574ce8f9adf91d04a6056c9de42e)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 84e9f64deaf7df4a652c240a062dc7692283ad44)
@@ -109,6 +109,8 @@
 
     setupForDialysateRecirculationState();
 
+    signalUserRateChange();  // so pressure limits re-stabilize
+
     // Reset saline bolus state in case alarm interrupted one
     resetSalineBolus();
 
@@ -451,7 +453,9 @@
         data.timeout   = 0;
         data.countdown = 0;
 
-        if ( ( getRinsebackCompleted() != TRUE ) && ( isAlarmActive( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM ) != TRUE ) )
+        if ( ( getRinsebackCompleted() != TRUE ) &&
+             ( isAlarmActive( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_ALARM ) != TRUE ) &&
+             ( isAlarmActive( ALARM_ID_HD_TREATMENT_STOPPED_NO_RINSEBACK ) != TRUE ) )
         {
             if ( bloodSittingTimerCtr > 0 )
             {