Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r2e6c7c4355ade64dafa49ad1241cbddd1db317de -rac56e4e0486aedb65cfce74a6d0724281ca6fb7f
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 2e6c7c4355ade64dafa49ad1241cbddd1db317de)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision ac56e4e0486aedb65cfce74a6d0724281ca6fb7f)
@@ -239,7 +239,7 @@
 static void checkDialInPumpFlowRate( void );
 static F32  calcDialInFlow( void );
 static F32  dialysateInPumpPWMFromTargetFlowRate( F32 QdTarget );
-static void setDialInPumpWithPWM( F32 pwm );
+static BOOL setDialInPumpWithPWM( F32 pwm );
 
 /*********************************************************************//**
  * @brief
@@ -1508,7 +1508,7 @@
  * @param pwm, the new pwm value
  * @return TRUE if new flow rate & dir are set, FALSE if not
  **************************************************************************/
-static void setDialInPumpWithPWM( F32 pwm )
+static BOOL setDialInPumpWithPWM( F32 pwm )
 {
     MOTOR_DIR_T dir = MOTOR_DIR_FORWARD;
     BOOL result = FALSE;
@@ -1906,7 +1906,7 @@
              absolutePWM > MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE )
         {
             // if exactly zero, clear test flag
-            if ( value == 0 )
+            if ( pwmPct == 0 )
             {
                 isTestPWMSet = FALSE;
             }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r044d8892373acc5545020aab894cd1943c4d7449 -rac56e4e0486aedb65cfce74a6d0724281ca6fb7f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 044d8892373acc5545020aab894cd1943c4d7449)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision ac56e4e0486aedb65cfce74a6d0724281ca6fb7f)
@@ -1376,7 +1376,7 @@
                 handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE:
+            case MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE:
                 handleHDDialInPumpRotorCountOverrideRequest( message );
                 break;