Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r54ee9a1d1778fd6f33735082a5e4e58facce5292 -r315969d00060073e112c4619946c13a61f68bcbd
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 54ee9a1d1778fd6f33735082a5e4e58facce5292)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 315969d00060073e112c4619946c13a61f68bcbd)
@@ -176,6 +176,7 @@
             else
             {
                 generateStopCondition();
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
             }
         }
 
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -re5d1d67106a93a6cd1b5692b586625d715732e2f -r315969d00060073e112c4619946c13a61f68bcbd
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 315969d00060073e112c4619946c13a61f68bcbd)
@@ -74,7 +74,7 @@
     switch( currentConsumableSelfTestState )
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
-#ifdef SKIP_CONSUMABLE_TESTS
+#ifdef SKIP_UI_INTERACTION
             consumableInstallConfirmed = TRUE;
 #endif
             // TODO: Check for DG straw door status to be open once DG door driver implemented
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r58684c1143b857acda909082d4906bea12745784 -r315969d00060073e112c4619946c13a61f68bcbd
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 58684c1143b857acda909082d4906bea12745784)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 315969d00060073e112c4619946c13a61f68bcbd)
@@ -870,7 +870,7 @@
     else
     {
         result = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;