Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rea731c287a4e43901956aaa9a0009a5ee8f4671f -ref1d6b657a58e367d823e09bfbf38cb52552d64f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ea731c287a4e43901956aaa9a0009a5ee8f4671f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ef1d6b657a58e367d823e09bfbf38cb52552d64f)
@@ -5041,13 +5041,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 ) );
@@ -5258,6 +5258,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rea731c287a4e43901956aaa9a0009a5ee8f4671f -ref1d6b657a58e367d823e09bfbf38cb52552d64f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ea731c287a4e43901956aaa9a0009a5ee8f4671f)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ef1d6b657a58e367d823e09bfbf38cb52552d64f)
@@ -917,9 +917,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );