Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -r77392c1537f02650413087b86b946370a6289dcd
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision aa8b9687b9396b4878cf0d5327d72a5d67477761)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 77392c1537f02650413087b86b946370a6289dcd)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      07-Feb-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      10-Feb-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -2370,7 +2370,7 @@
         FLOW_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( FLOW_SENSORS_DATA_T ) );
-        setDialysateFlowData( payload.dialysateFlowRateLPM );
+        setDialysateFlowData( payload );
     }
 }
 
@@ -5052,13 +5052,13 @@
  *************************************************************************/
 void handleSetBloodLeakStatusOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );