Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r6e12521320e55a0411ad81238c863bd05c66e5df -r09c9b0a231958ecb06bb868d136bfd99b5be07b9
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 6e12521320e55a0411ad81238c863bd05c66e5df)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 09c9b0a231958ecb06bb868d136bfd99b5be07b9)
@@ -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
@@ -216,7 +216,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 );
 }
 
@@ -513,7 +513,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 );
         }
@@ -522,7 +522,7 @@
             resetPIController( PI_CONTROLLER_ID_ULTRAFILTRATION, dialOutPumpPWMDutyCyclePctSet - getDialInPumpPWMDutyCyclePct() );
         }
         dialOutPumpControlModeSet = dialOutPumpControlMode;
-        setDialOutPumpControlSignalPWM( dialOutPumpPWMDutyCyclePct );
+        setDialOutPumpControlSignalPWM( dialOutPumpPWMDutyCyclePctSet );
         dopControlTimerCounter = 0;
         result = DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE;
     }