Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -rca8a4a4cf6d2c59d9296c3abdf314765550a2624 -rd9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision ca8a4a4cf6d2c59d9296c3abdf314765550a2624)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision d9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6)
@@ -71,7 +71,7 @@
 SELF_TEST_STATUS_T execBloodLeakSelfTest( void );
 
 BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
-SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void );
+SELF_TEST_STATUS_T  getBloodLeakSelfTestStatus( void );
 
 BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakDataPublishIntervalOverride( void );
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rca8a4a4cf6d2c59d9296c3abdf314765550a2624 -rd9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision ca8a4a4cf6d2c59d9296c3abdf314765550a2624)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6)
@@ -1027,7 +1027,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rca8a4a4cf6d2c59d9296c3abdf314765550a2624 -rd9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ca8a4a4cf6d2c59d9296c3abdf314765550a2624)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6)
@@ -5800,6 +5800,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 -rca8a4a4cf6d2c59d9296c3abdf314765550a2624 -rd9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision ca8a4a4cf6d2c59d9296c3abdf314765550a2624)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision d9fb74cda4b2c4c8f6e36ba3af978fde8e19b3e6)
@@ -952,9 +952,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 );