Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
@@ -86,7 +86,7 @@
 
 #ifndef V2_0_SYSTEM
     #define BP_SPEED_ADC_TO_RPM_FACTOR          1.751752    ///< Conversion factor from ADC counts to RPM for blood pump motor
-    #define BP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.00025     ///< ~40 BP motor RPM = 1% PWM duty cycle
+    #define BP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000238    ///< ~40 BP motor RPM = 1% PWM duty cycle
 #else
     #define BP_SPEED_ADC_TO_RPM_FACTOR          1.280938    ///< Conversion factor from ADC counts to RPM for blood pump motor
     #define BP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.0003125   ///< ~32 BP motor RPM = 1% PWM duty cycle
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
@@ -86,9 +86,9 @@
 
 #ifndef V2_0_SYSTEM
     #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.751752    ///< Conversion factor from ADC counts to RPM for dialIn pump motor.
-    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.00025     ///< ~40 BP motor RPM = 1% PWM duty cycle
+    #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.000198    ///< ~40 BP motor RPM = 1% PWM duty cycle
 #else
-    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938    ///< Conversion factor from ADC counts to RPM for blood pump motor
+    #define DIP_SPEED_ADC_TO_RPM_FACTOR          1.280938    ///< Conversion factor from ADC counts to RPM for dialIn pump motor
     #define DIP_MOTOR_RPM_TO_PWM_DC_FACTOR       0.0003125   ///< ~32 BP motor RPM = 1% PWM duty cycle
 #endif
 #define DIP_CURRENT_ADC_TO_MA_FACTOR         3.002           ///< Conversion factor from ADC counts to mA for dialIn pump motor.
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -rc48ea51c06c9d002f1b9b6a1d7b72d69756f183d -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision c48ea51c06c9d002f1b9b6a1d7b72d69756f183d)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
@@ -85,7 +85,7 @@
 
 #ifndef V2_0_SYSTEM
     #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
-    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.00025         ///< ~40 BP motor RPM = 1% PWM duty cycle
+    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.000198        ///< ~40 BP motor RPM = 1% PWM duty cycle
 #else
     #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.280938        ///< Conversion factor from ADC counts to RPM for blood pump motor
     #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.0003125       ///< ~32 BP motor RPM = 1% PWM duty cycle
@@ -219,7 +219,7 @@
     }
 
     // Initialize dialysate outlet flow PI controller
-    initializePIController( PI_CONTROLLER_ID_ULTRAFILTRATION, 0, DOP_P_COEFFICIENT, DOP_I_COEFFICIENT,
+    initializePIController( PI_CONTROLLER_ID_ULTRAFILTRATION, 0.0, DOP_P_COEFFICIENT, DOP_I_COEFFICIENT,
                             MIN_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL, MAX_DIAL_OUT_PUMP_PWM_OFFSET_CONTROL );
 }
 
@@ -516,7 +516,7 @@
     else if ( dialOutPumpPWMDutyCyclePctSet >= dialOutPumpPWMDutyCyclePct )
     {
         dialOutPumpPWMDutyCyclePctSet = dialOutPumpPWMDutyCyclePct;
-        if ( dialOutPumpControlModeSet == PUMP_CONTROL_MODE_OPEN_LOOP )
+        if ( dialOutPumpControlMode == PUMP_CONTROL_MODE_OPEN_LOOP )
         {
             resetPIController( PI_CONTROLLER_ID_ULTRAFILTRATION, dialOutPumpPWMDutyCyclePctSet );
         }
@@ -525,7 +525,7 @@
             resetPIController( PI_CONTROLLER_ID_ULTRAFILTRATION, dialOutPumpPWMDutyCyclePctSet - getDialInPumpPWMDutyCyclePct() );
         }
         dialOutPumpControlModeSet = dialOutPumpControlMode;
-        setDialOutPumpControlSignalPWM( dialOutPumpPWMDutyCyclePct );
+        setDialOutPumpControlSignalPWM( dialOutPumpPWMDutyCyclePctSet );
         dopControlTimerCounter = 0;
         result = DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE;
     }
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r172b320a1007769c7452fe3f1cc7ac85b016f89a -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 172b320a1007769c7452fe3f1cc7ac85b016f89a)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
@@ -82,6 +82,7 @@
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps
     #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms
+    #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     #include <stdio.h>
     #include <strings.h>
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r60e0fc291e3897ab9b86aee7181eeb6d6dd7d35f -rbaa9fb9bb10eed6cd211abaa80e9f9acffdeb20d
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 60e0fc291e3897ab9b86aee7181eeb6d6dd7d35f)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision baa9fb9bb10eed6cd211abaa80e9f9acffdeb20d)
@@ -381,6 +381,7 @@
  *************************************************************************/
 static SELF_TEST_STATUS_T execUITest( void )
 {
+#ifndef DISABLE_UI_POST_TEST
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
     // UI should have sent POST results before we start this test
@@ -402,6 +403,9 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_UI_POST_FAILED, 1 )
         result = SELF_TEST_STATUS_FAILED;
     }
+#else
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
+#endif
 
     return result;
 }