Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r450fd51053df274149ec091955baa33e23e1c7a7 -redbe7477408438824f39a8e1ff96eff4a0115ff4
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 450fd51053df274149ec091955baa33e23e1c7a7)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision edbe7477408438824f39a8e1ff96eff4a0115ff4)
@@ -1193,7 +1193,7 @@
     {
         F32 flow = (F32)targetDialInFlowRate;
         F32 speed = getMeasuredDialInPumpSpeed();
-        F32 impliedSpeed = ( flow / (F32)ML_PER_LITER ) * DIP_REV_PER_LITER * DIP_GEAR_RATIO;
+        F32 impliedSpeed = DIP_PWM_TO_MOTOR_SPEED_RPM( DIP_PWM_FROM_ML_PER_MIN( flow ) );
         F32 delta = fabs( speed - impliedSpeed );
 
         if ( delta > DIP_MAX_FLOW_VS_SPEED_DIFF_RPM )
Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -redbe7477408438824f39a8e1ff96eff4a0115ff4
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision edbe7477408438824f39a8e1ff96eff4a0115ff4)
@@ -37,6 +37,7 @@
 // ********** private definitiions ***********
 
 #define TUBING_BLOOD_PRIME_VOLUME_ML                80.0F                   ///< Target blood prime volume to prime the blood side circuit (in mL).
+#define DEFAULT_BLOOD_PRIME_VOLUME_ML               300.0F                  ///< Default blood prime volume (in mL).
 #define MAX_BLOOD_PRIME_VOLUME_ERROR_ML             60.0F                   ///< Maximum error in total additional blood prime volume (20% of total).
 #define MIN_RAMP_TIME_SEC                           60                      ///< Minimum ramp time for blood prime (in seconds).
 
@@ -93,7 +94,7 @@
     bloodPrimePublishTimerCtr = BLOOD_PRIME_DATA_PUBLISH_INTERVAL;
     cumulativeBloodPrimeVolume_mL.data = 0.0;
     expectedBloodPrimeVolume_mL = 0.0;
-    bloodPrimeTargetVolume_mL = 300.0;
+    bloodPrimeTargetVolume_mL = DEFAULT_BLOOD_PRIME_VOLUME_ML;
     resetBloodPrimeFlags();
 
     bloodPrimeTargetVolume_mL = (F32)TUBING_BLOOD_PRIME_VOLUME_ML + (F32)getDialyzerBloodVolume();
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -ra7675f3c917b632cf16207fc7ccfc1f38eb83f9b -redbe7477408438824f39a8e1ff96eff4a0115ff4
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision a7675f3c917b632cf16207fc7ccfc1f38eb83f9b)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision edbe7477408438824f39a8e1ff96eff4a0115ff4)
@@ -38,6 +38,7 @@
 // ********** private definitions **********
 
 #define TUBING_RINSEBACK_VOLUME_ML                   80.0F                  ///< Target rinseback volume to deliver back to the patient (in mL).
+#define DEFAULT_RINSEBACK_VOLUME_ML                 300.0F                  ///< Default rinseback volume (in mL).
 #define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML    300.0F                  ///< Maximum total additional rinseback volume allowed : all additionals (in mL).
 #define MAX_RINSEBACK_VOLUME_ERROR_ML                60.0F                  ///< Maximum error in total additional rinseback volume (20% of total).
 #define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML        10.0F                  ///< Target rinseback volume for an additional volume request (in mL).
@@ -135,7 +136,7 @@
     totalAdditionalRinsebackVolume_mL = 0.0;
     rinsebackAdditionalTimerCtr = 0;
     rinsebackPublishTimerCtr = 0;
-    rinsebackTargetVolume_mL = 300.0;
+    rinsebackTargetVolume_mL = DEFAULT_RINSEBACK_VOLUME_ML;
     resetRinsebackFlags();
 }