Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0b800d3abb747d0f1f3dc8f67777efb9631c18e0 -r85b43b31e65b2820237d864bd5e67feca03b98ee
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0b800d3abb747d0f1f3dc8f67777efb9631c18e0)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 85b43b31e65b2820237d864bd5e67feca03b98ee)
@@ -7,8 +7,8 @@
 *
 * @file    BloodFlow.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      26-Jul-2023
+* @author  (last)      Sean Nash
+* @date    (last)      17-Jul-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  07-Nov-2019
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r0b800d3abb747d0f1f3dc8f67777efb9631c18e0 -r85b43b31e65b2820237d864bd5e67feca03b98ee
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0b800d3abb747d0f1f3dc8f67777efb9631c18e0)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 85b43b31e65b2820237d864bd5e67feca03b98ee)
@@ -8,7 +8,7 @@
 * @file    DialInFlow.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      20-Jul-2023
+* @date    (last)      17-Jul-2023
 *
 * @author  (original)  Sean
 * @date    (original)  16-Dec-2019
@@ -517,7 +517,7 @@
     }
     else
     {   // Alarm if not receiving new dialysate flow readings in timely manner
-        if ( ( TRUE == isDGCommunicating() ) && ( isACPowerLost() != TRUE ) )
+        if ( ( TRUE == isDGCommunicating() ) && ( FALSE == isACPowerLost() ) )
         {
             if ( ++dialysateFlowDataFreshStatusCounter > DIP_DIALYSATE_FLOW_DATA_ALARM_THRESHOLD )
             {
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r495f23da704aca02692ef3e01358577992b61752 -r85b43b31e65b2820237d864bd5e67feca03b98ee
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 495f23da704aca02692ef3e01358577992b61752)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 85b43b31e65b2820237d864bd5e67feca03b98ee)
@@ -434,11 +434,14 @@
  *************************************************************************/
 void signalDialOutPumpHardStop( void )
 {
-    lastGivenRate = 0;
-    stopDialOutPump();
-    dialOutPumpState = DIAL_OUT_PUMP_OFF_STATE;
+    dialOutPumpControlMode = PUMP_CONTROL_MODE_OPEN_LOOP;
+    dialOutPumpDirection = MOTOR_DIR_FORWARD;
     dialOutPumpPWMDutyCyclePct = DOP_PWM_ZERO_OFFSET;
+    dialOutPumpState = DIAL_OUT_PUMP_OFF_STATE;
+    dopControlSignal = FALSE;
+    lastGivenRate = 0;
     resetDialOutFlowMovingAverage();
+    stopDialOutPump();
 }
 
 /*********************************************************************//**