Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r8d44b80febc4574ce8f9adf91d04a6056c9de42e -r6d19d844800eaaa05d03561c7f6e2d882de2c1ff
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 8d44b80febc4574ce8f9adf91d04a6056c9de42e)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 6d19d844800eaaa05d03561c7f6e2d882de2c1ff)
@@ -47,9 +47,11 @@
 /// Interval (ms/task time) at which the blood flow data is published on the CAN bus.
 #define BLOOD_FLOW_DATA_PUB_INTERVAL        ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )
 
+#define MAX_SETTABLE_BLOOD_FLOW_RATE        700             ///< Maximum settable blood flow rate (in mL/min).
+
 #define MAX_BLOOD_PUMP_PWM_STEP_UP_CHANGE   0.008F          ///< Max duty cycle change when ramping up ~ 100 mL/min/s.
 #define MAX_BLOOD_PUMP_PWM_STEP_DN_CHANGE   0.016F          ///< Max duty cycle change when ramping down ~ 200 mL/min/s.
-#define MAX_BLOOD_PUMP_PWM_DUTY_CYCLE       0.89F           ///< Controller will error if PWM duty cycle > 90%, so set max to 89%
+#define MAX_BLOOD_PUMP_PWM_DUTY_CYCLE       0.90F           ///< Controller will error if PWM duty cycle > 90%, so set max to 89%
 #define MIN_BLOOD_PUMP_PWM_DUTY_CYCLE       0.10F           ///< Controller will error if PWM duty cycle < 10%, so set min to 10%
 
 #define BP_CONTROL_INTERVAL_SEC             10              ///< Blood pump control interval (in seconds).
@@ -289,7 +291,7 @@
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( dirFlowRate != targetBloodFlowRate ) || ( mode != bloodPumpControlMode ) )
         {
-            BOOL isFlowInrange = ( flowRate <= MAX_SET_BLOOD_FLOW_RATE ? TRUE : FALSE );
+            BOOL isFlowInrange = ( flowRate <= MAX_SETTABLE_BLOOD_FLOW_RATE ? TRUE : FALSE );
 
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) )
@@ -306,6 +308,7 @@
                 bloodPumpControlMode = mode;
                 // Set PWM duty cycle target to an estimated initial target to ramp to based on target flow rate - then we will control to flow when ramp completed
                 bloodPumpPWMDutyCyclePct = BP_PWM_FROM_ML_PER_MIN((F32)flowRate);   // ~ 8% per 100 mL/min with a 10% zero offset added in (e.g. 100 mL/min = 8+10 = 18%)
+                bloodPumpPWMDutyCyclePct = RANGE( bloodPumpPWMDutyCyclePct, MIN_BLOOD_PUMP_PWM_DUTY_CYCLE, MAX_BLOOD_PUMP_PWM_DUTY_CYCLE );
 
                 switch ( bloodPumpState )
                 {
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r8d44b80febc4574ce8f9adf91d04a6056c9de42e -r6d19d844800eaaa05d03561c7f6e2d882de2c1ff
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 8d44b80febc4574ce8f9adf91d04a6056c9de42e)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6d19d844800eaaa05d03561c7f6e2d882de2c1ff)
@@ -47,6 +47,8 @@
 /// Interval (ms/task time) at which the dialIn flow data is published on the CAN bus.
 #define DIAL_IN_FLOW_DATA_PUB_INTERVAL       ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )
 
+#define MAX_SETTABLE_DIAL_IN_FLOW_RATE       700             ///< Maximum settable dialysate inlet flow rate (in mL/min).
+
 #define MAX_DIAL_IN_PUMP_PWM_STEP_UP_CHANGE  0.0133F         ///< Max duty cycle change when ramping up ~ 200 mL/min/s.
 #define MAX_DIAL_IN_PUMP_PWM_STEP_DN_CHANGE  0.02F           ///< Max duty cycle change when ramping down ~ 300 mL/min/s.
 #define MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE      0.90F           ///< Controller will error if PWM duty cycle > 90%, so set max to 90%.
@@ -303,7 +305,7 @@
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( dirFlowRate != targetDialInFlowRate ) || ( mode != dialInPumpControlMode ) )
         {
-            BOOL isFlowRateInRange = ( flowRate <= MAX_DIAL_IN_FLOW_RATE ? TRUE : FALSE );
+            BOOL isFlowRateInRange = ( flowRate <= MAX_SETTABLE_DIAL_IN_FLOW_RATE ? TRUE : FALSE );
 
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) )
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r8d44b80febc4574ce8f9adf91d04a6056c9de42e -r6d19d844800eaaa05d03561c7f6e2d882de2c1ff
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 8d44b80febc4574ce8f9adf91d04a6056c9de42e)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6d19d844800eaaa05d03561c7f6e2d882de2c1ff)
@@ -49,7 +49,7 @@
 /// Interval (ms/task time) at which the dialysate outlet flow is filtered.
 #define DIAL_OUT_FILTER_INTERVAL                ( 100 / TASK_PRIORITY_INTERVAL )
 
-#define MAX_DIAL_OUT_FLOW_RATE                  650             ///< Maximum dialysate outlet pump flow rate in mL/min.
+#define MAX_DIAL_OUT_FLOW_RATE                  700             ///< Maximum dialysate outlet pump flow rate in mL/min.
 #define MIN_DIAL_OUT_FLOW_RATE                  100             ///< Minimum dialysate outlet pump flow rate in mL/min.
 
 #define MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE    0.0133F         ///< Maximum duty cycle change when ramping up ~ 200 mL/min/s.