Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r91b04eef69e57cace883435caa5debfacf3edd71 -reb9e7f219b519e0ce02d00296ceb986f642b38fe
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 91b04eef69e57cace883435caa5debfacf3edd71)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
@@ -78,6 +78,9 @@
 {
     bloodLeakState = BLOOD_LEAK_INIT_STATE;
     bloodLeakStatus.data = BLOOD_LEAK_NOT_DETECTED;
+    bloodLeakStatus.ovInitData = BLOOD_LEAK_NOT_DETECTED;
+    bloodLeakStatus.ovData = BLOOD_LEAK_NOT_DETECTED;
+    bloodLeakStatus.override = OVERRIDE_RESET;
     bloodLeakSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
     bloodLeakZeroRequested = FALSE;
     bloodLeakZeroStartTime = 0;
Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -ra2c7252faf265a15b6c6c016a19adc385d06dc0e -reb9e7f219b519e0ce02d00296ceb986f642b38fe
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision a2c7252faf265a15b6c6c016a19adc385d06dc0e)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
@@ -55,6 +55,9 @@
 void initFluidLeak( void )
 {
     fluidLeakState.data = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.ovInitData = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.ovData = FLUID_LEAK_STATE_DRY;
+    fluidLeakState.override = OVERRIDE_RESET;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rc407a98464658e38b527e35da368764bfeb4b8d7 -reb9e7f219b519e0ce02d00296ceb986f642b38fe
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision c407a98464658e38b527e35da368764bfeb4b8d7)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision eb9e7f219b519e0ce02d00296ceb986f642b38fe)
@@ -1822,7 +1822,7 @@
     }
     else
     {
-        // TODO: Should never reach here
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_BUBBLE_ID, bubble )
     }
 }