Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r5f929b475f0143cd3597547e3c20a77a5abb6d9c
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5f929b475f0143cd3597547e3c20a77a5abb6d9c)
@@ -375,7 +375,7 @@
     targetBloodFlowRate = 0;
     stopBloodPump();
     bloodPumpState = BLOOD_PUMP_OFF_STATE;
-    bloodPumpPWMDutyCyclePct = 0.0;
+    bloodPumpPWMDutyCyclePct = BP_PWM_ZERO_OFFSET;
     bpControlTimerCounter = 0;
     resetPIController( PI_CONTROLLER_ID_BLOOD_FLOW, MIN_BLOOD_PUMP_PWM_DUTY_CYCLE );
 }
@@ -1286,7 +1286,6 @@
         }
         if ( ctrlMode < NUM_OF_PUMP_CONTROL_MODES )
         {
-            targetBloodFlowRate = value;
             result = setBloodPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
         }
     }
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r5f929b475f0143cd3597547e3c20a77a5abb6d9c
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 5f929b475f0143cd3597547e3c20a77a5abb6d9c)
@@ -333,7 +333,7 @@
     targetDialInFlowRate = 0;
     stopDialInPump();
     dialInPumpState = DIAL_IN_PUMP_OFF_STATE;
-    dialInPumpPWMDutyCyclePct = 0.0;
+    dialInPumpPWMDutyCyclePct = DIP_PWM_ZERO_OFFSET;
     dipControlTimerCounter = 0;
     resetPIController( PI_CONTROLLER_ID_DIALYSATE_FLOW, MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE );
 }
@@ -1306,7 +1306,6 @@
         }
         if ( ctrlMode < NUM_OF_PUMP_CONTROL_MODES )
         {
-            targetDialInFlowRate = value;
             result = setDialInPumpTargetFlowRate( abs(value), dir, (PUMP_CONTROL_MODE_T)ctrlMode );
         }
     }
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r5f929b475f0143cd3597547e3c20a77a5abb6d9c
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 5f929b475f0143cd3597547e3c20a77a5abb6d9c)
@@ -345,7 +345,7 @@
     lastGivenRate = 0;
     stopDialOutPump();
     dialOutPumpState = DIAL_OUT_PUMP_OFF_STATE;
-    dialOutPumpPWMDutyCyclePct = 0.0;
+    dialOutPumpPWMDutyCyclePct = DOP_PWM_ZERO_OFFSET;
     resetDialOutFlowMovingAverage();
 }