Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r2acda0ccdd00334bec87bfbe61c4e78e867925de -r0f7e24faee00439d8d212de3bda6f94dcca40855
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 2acda0ccdd00334bec87bfbe61c4e78e867925de)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0f7e24faee00439d8d212de3bda6f94dcca40855)
@@ -555,7 +555,7 @@
     BLOOD_PUMP_STATE_T result = BLOOD_PUMP_RAMPING_DOWN_STATE;
 
     // have we essentially reached zero speed
-    if ( bloodPumpPWMDutyCyclePctSet < (MAX_BLOOD_PUMP_PWM_STEP_UP_CHANGE + BP_PWM_ZERO_OFFSET) )
+    if ( bloodPumpPWMDutyCyclePctSet < (MAX_BLOOD_PUMP_PWM_STEP_DN_CHANGE + BP_PWM_ZERO_OFFSET) )
     {
         stopBloodPump();
         result = BLOOD_PUMP_OFF_STATE;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r2acda0ccdd00334bec87bfbe61c4e78e867925de -r0f7e24faee00439d8d212de3bda6f94dcca40855
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 2acda0ccdd00334bec87bfbe61c4e78e867925de)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0f7e24faee00439d8d212de3bda6f94dcca40855)
@@ -521,7 +521,7 @@
     DIAL_IN_PUMP_STATE_T result = DIAL_IN_PUMP_RAMPING_DOWN_STATE;
 
     // have we essentially reached zero speed
-    if ( dialInPumpPWMDutyCyclePctSet < (MAX_DIAL_IN_PUMP_PWM_STEP_UP_CHANGE + DIP_PWM_ZERO_OFFSET) )
+    if ( dialInPumpPWMDutyCyclePctSet < (MAX_DIAL_IN_PUMP_PWM_STEP_DN_CHANGE + DIP_PWM_ZERO_OFFSET) )
     {
         stopDialInPump();
         result = DIAL_IN_PUMP_OFF_STATE;
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r2acda0ccdd00334bec87bfbe61c4e78e867925de -r0f7e24faee00439d8d212de3bda6f94dcca40855
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 2acda0ccdd00334bec87bfbe61c4e78e867925de)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 0f7e24faee00439d8d212de3bda6f94dcca40855)
@@ -535,7 +535,7 @@
     DIAL_OUT_PUMP_STATE_T result = DIAL_OUT_PUMP_RAMPING_UP_STATE;
 
     // have we been asked to stop the dialOut pump?
-    if ( dialOutPumpPWMDutyCyclePct < NEARLY_ZERO )
+    if ( dialOutPumpPWMDutyCyclePct < (MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE + DOP_PWM_ZERO_OFFSET) )
     {
         // start ramp down to stop
         dialOutPumpPWMDutyCyclePctSet -= MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE;
@@ -579,7 +579,7 @@
     DIAL_OUT_PUMP_STATE_T result = DIAL_OUT_PUMP_RAMPING_DOWN_STATE;
 
     // have we essentially reached zero speed
-    if ( dialOutPumpPWMDutyCyclePctSet < (MAX_DIAL_OUT_PUMP_PWM_STEP_UP_CHANGE + DOP_PWM_ZERO_OFFSET) )
+    if ( dialOutPumpPWMDutyCyclePctSet < (MAX_DIAL_OUT_PUMP_PWM_STEP_DN_CHANGE + DOP_PWM_ZERO_OFFSET) )
     {
         stopDialOutPump();
         result = DIAL_OUT_PUMP_OFF_STATE;
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rbd4cfd6101ef41d898e36aed764fd15f01ec7255 -r0f7e24faee00439d8d212de3bda6f94dcca40855
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision bd4cfd6101ef41d898e36aed764fd15f01ec7255)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 0f7e24faee00439d8d212de3bda6f94dcca40855)
@@ -950,7 +950,7 @@
     SALINE_BOLUS_STATE_T result = SALINE_BOLUS_STATE_IN_PROGRESS;
     BOOL errorFound = FALSE;
     F32 timeSinceLastVolumeUpdateMin = (F32)calcTimeSince( bolusSalineLastVolumeTimeStamp ) / (F32)( MS_PER_SECOND * SEC_PER_MIN );
-    F32 bolusTargetVolume = getTreatmentParameterU32( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
+    F32 bolusTargetVolume = (F32)getTreatmentParameterU32( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
     F32 bldFlowRate = getMeasuredBloodFlowRate();  // TODO - should I use raw flow instead of filtered here???
     F32 volSinceLastUpdateMl = bldFlowRate * timeSinceLastVolumeUpdateMin;
     U32 bldPumpMotorCount = getBloodPumpMotorCount();