Index: firmware/App/Modes/StateTxRinseback.c
===================================================================
diff -u -r5ace05425139aa4c64318ecd3b90782e01ef2f7d -rb122cc0df5e564329758d7561bd2ca430454ec6d
--- firmware/App/Modes/StateTxRinseback.c	(.../StateTxRinseback.c)	(revision 5ace05425139aa4c64318ecd3b90782e01ef2f7d)
+++ firmware/App/Modes/StateTxRinseback.c	(.../StateTxRinseback.c)	(revision b122cc0df5e564329758d7561bd2ca430454ec6d)
@@ -431,7 +431,8 @@
     RINSEBACK_STATE_T state = RINSEBACK_PAUSED_STATE;
 
     // User requested to resume
-    if ( TRUE == resumeRinsebackRequested )
+    if ( ( TRUE == resumeRinsebackRequested ) &&
+         ( bloodSittingTimerCtr < MAX_TIME_BLOOD_SITTING ) )
     {
         setupForRinsebackDelivery();
         state = prevRunState;
@@ -682,7 +683,7 @@
  * The handleIncrRinsebackUserAction function handles an increase rinseback
  * flow rate user action request.  It is assumed that the calling function will set
  * the reject reason parameter to None beforehand.
- * @details \b Inputs: currentRinsebackState
+ * @details \b Inputs: none
  * @details \b Outputs: rinsebackPublishTimerCtr
  * @param rejReason Code indicating reason for rejection
  * @return TRUE if user action accepted, FALSE if not
@@ -696,17 +697,9 @@
 
     if ( newRinsebackRate <= MAX_RINSEBACK_FLOW_RATE_ML_MIN )
     {
-        if ( ( RINSEBACK_RUN_STATE == currentRinsebackState ) ||
-             ( RINSEBACK_RUN_ADDITIONAL_STATE == currentRinsebackState ) )
-        {
-            result = TRUE;
-            incOrDecRinsebackFlowRate();
-            rinsebackPublishTimerCtr = getPublishRinsebackInterval();
-        }
-        else
-        {
-            *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE;
-        }
+        result = TRUE;
+        incOrDecRinsebackFlowRate();
+        rinsebackPublishTimerCtr = getPublishRinsebackInterval();
     }
     else
     {
@@ -721,7 +714,7 @@
  * The handleDecrRinsebackUserAction function handles a decrease rinseback
  * flow rte user action request.  It is assumed that the calling function will set
  * the reject reason parameter to None beforehand.
- * @details \b Inputs: currentRinsebackState
+ * @details \b Inputs: none
  * @details \b Outputs: decrRinsebackFlowRateRequested, rinsebackPublishTimerCtr
  * @param rejReason Code indicating reason for rejection
  * @return TRUE if user action accepted, FALSE if not
@@ -735,17 +728,9 @@
 
     if ( newRinsebackRate >= MIN_RINSEBACK_FLOW_RATE_ML_MIN )
     {
-        if ( ( RINSEBACK_RUN_STATE == currentRinsebackState ) ||
-             ( RINSEBACK_RUN_ADDITIONAL_STATE == currentRinsebackState ) )
-        {
-            result = TRUE;
-            incOrDecRinsebackFlowRate();
-            rinsebackPublishTimerCtr = getPublishRinsebackInterval();
-        }
-        else
-        {
-            *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE;
-        }
+        result = TRUE;
+        incOrDecRinsebackFlowRate();
+        rinsebackPublishTimerCtr = getPublishRinsebackInterval();
     }
     else
     {
Index: firmware/App/Services/StateServices/FluidBolus.c
===================================================================
diff -u -r5ace05425139aa4c64318ecd3b90782e01ef2f7d -rb122cc0df5e564329758d7561bd2ca430454ec6d
--- firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision 5ace05425139aa4c64318ecd3b90782e01ef2f7d)
+++ firmware/App/Services/StateServices/FluidBolus.c	(.../FluidBolus.c)	(revision b122cc0df5e564329758d7561bd2ca430454ec6d)
@@ -352,18 +352,14 @@
     FLUID_BOLUS_STATE_T state = FLUID_BOLUS_IN_PROGRESS_STATE;
     F32 bolusTargetVolume = (F32)getTreatmentParameterU32( TREATMENT_PARAM_FLUID_BOLUS_VOLUME );
 
-    // TODO
+    // TODO: Need to update this and also how to update Qsub rate?
     // Track live blood flow rate changes so pump command and volume integration stay in sync
     targetBloodFlowMLPM = getTreatmentParameterU32( TREATMENT_PARAM_BLOOD_FLOW );
 
     if ( FLUID_TYPE_SALINE == fluidType )
     {
         setBloodPumpTargetFlowRate( targetBloodFlowMLPM, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     }
-    else
-    {
-        cmdSubstitutionRate( (F32)targetBloodFlowMLPM );
-    }
 
     updateFluidBolusVolumeDelivered();