Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r55cc500c07e3bb06926014c47553aa1419559407 -reb64545b0bddac878e5d930272c6c8068bb4089a
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 55cc500c07e3bb06926014c47553aa1419559407)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
@@ -366,7 +366,7 @@
             BUBBLE_STATUS_T statusADA = getBubbleStatus( ADA );
             BUBBLE_STATUS_T statusADV = getBubbleStatus( ADV );
 
-            broadcastBubblesData( statusADA, (U32)bubblesState[ ADA ], statusADV, (U32)bubblesState[ ADV ] );
+            broadcastBubblesData( (U32)statusADA, (U32)bubblesState[ ADA ], (U32)statusADV, (U32)bubblesState[ ADV ] );
             bubblesDataPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r518745cc77b07b0a6aa35d5530255d2bcc8b1090 -reb64545b0bddac878e5d930272c6c8068bb4089a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 518745cc77b07b0a6aa35d5530255d2bcc8b1090)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "AlarmMgmt.h"
+#include "Buttons.h"
 #include "ConsumableSelfTest.h"
 #include "FPGA.h"
 #include "ModePreTreat.h"
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3d30c9829d316b8c5e632c0201a59c8d14b3486e -reb64545b0bddac878e5d930272c6c8068bb4089a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d30c9829d316b8c5e632c0201a59c8d14b3486e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
@@ -1917,15 +1917,15 @@
 
 /***********************************************************************//**
  * @brief
- * The broadcastBloodLeakData function constructs an HD blood leak data msg to \n
+ * The broadcastBubblesData function constructs an HD air bubble data msg to \n
  * be broadcasted and queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
- * @details Outputs: blood leak data msg constructed and queued
- * @param status blood leak status
- * @param state blood leak state
+ * @details Outputs: air bubbles data msg constructed and queued
+ * @param status air bubbles status
+ * @param state air bubbles states
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastBubblesData( BUBBLE_STATUS_T statusADA, U32 stateADA, BUBBLE_STATUS_T statusADV, U32 stateADV )
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -5032,9 +5032,9 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( 0 == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         result = TRUE;
         selfTestBubble( (BUBBLES_T)payload.index );
     }
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r3d30c9829d316b8c5e632c0201a59c8d14b3486e -reb64545b0bddac878e5d930272c6c8068bb4089a
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 3d30c9829d316b8c5e632c0201a59c8d14b3486e)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision eb64545b0bddac878e5d930272c6c8068bb4089a)
@@ -352,7 +352,7 @@
 BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, U32 state );
 
 // MSG_ID_HD_BUBBLES_DATA
-BOOL broadcastBubblesData( BUBBLE_STATUS_T statusADA, U32 stateADA, BUBBLE_STATUS_T statusADV, U32 stateADV );
+BOOL broadcastBubblesData( U32 statusADA, U32 stateADA, U32 statusADV, U32 stateADV );
 
 // MSG_ID_HD_PRIMING_STATUS_DATA
 BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr );