Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r3956c379375c22a95accfd791245e32e0782705a -r9c0470dd725f1399b558f2eaf91f0275c5e021f1
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 3956c379375c22a95accfd791245e32e0782705a)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 9c0470dd725f1399b558f2eaf91f0275c5e021f1)
@@ -524,7 +524,12 @@
     }
 
     // If retries for commands exceeds limit, fault
-    if ( ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES ) || ( fpgaSensorReadings.errorCountProcessor > MAX_COMM_ERROR_RETRIES ) )
+    if ( ( fpgaCommRetryCount > MAX_COMM_ERROR_RETRIES )
+#ifdef _RELEASE_
+         || ( fpgaSensorReadings.errorCountProcessor > MAX_COMM_ERROR_RETRIES ) )
+#else
+         )
+#endif
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_FPGA_COMM_TIMEOUT, fpgaCommRetryCount, (U32)fpgaSensorReadings.errorCountProcessor )
     }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5fef605363d4f8023b3db2989b097b6c5f58db1a -r9c0470dd725f1399b558f2eaf91f0275c5e021f1
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5fef605363d4f8023b3db2989b097b6c5f58db1a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9c0470dd725f1399b558f2eaf91f0275c5e021f1)
@@ -1531,6 +1531,7 @@
 
             case MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE:
                 handleSetFluidLeakStateDetectorOverrideRequest( message );
+                break;
 
             case MSG_ID_HD_SET_OP_MODE_REQUEST:
                 handleTestSetOpModeRequest( message );