Index: firmware/App/Controllers/UVReactors.c
===================================================================
diff -u -rccf1219089b835ab2f9d401c0be0d2000be9010a -r594e11a544c7d3f97f057a2d4c146f464e437948
--- firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision ccf1219089b835ab2f9d401c0be0d2000be9010a)
+++ firmware/App/Controllers/UVReactors.c	(.../UVReactors.c)	(revision 594e11a544c7d3f97f057a2d4c146f464e437948)
@@ -318,6 +318,7 @@
         {
             uvReactorsSelfTestResult = SELF_TEST_STATUS_FAILED;
 
+#ifndef DISABLE_UV_REACTOR_MONITOR
             // Check which reactor has not been healthy and raise an alarm
             if ( FALSE == isInletHealthy )
             {
@@ -327,6 +328,7 @@
             {
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_UV_REACTOR_NOT_HEALTHY, OUTLET_UV_REACTOR );
             }
+#endif
         }
 
         // Turn off the UV reactors once the test is finished
@@ -379,13 +381,16 @@
 
     BOOL isReactorHealthy = getUVReactorHealth( reactor );
 
+
+#ifndef DISABLE_UV_REACTOR_MONITOR
     checkPersistentAlarm( ALARM_ID_UV_REACTOR_NOT_HEALTHY, !isReactorHealthy, (U32)reactor, MAX_ALLOWED_UNHEALTHY_REACTOR_PERIOD );
 
     // Check if the alarm has been active
     if( isAlarmActive( ALARM_ID_UV_REACTOR_NOT_HEALTHY ) )
     {
         reactorsStatus[ reactor ].switchState = TURN_OFF;
     }
+#endif
 
     // Check if it has been requested to turn off a reactor
     if( TURN_OFF == reactorsStatus[ reactor ].switchState )
Index: firmware/App/DGCommon.h
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r594e11a544c7d3f97f057a2d4c146f464e437948
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 594e11a544c7d3f97f057a2d4c146f464e437948)
@@ -54,6 +54,9 @@
     #define DISABLE_COND_SENSOR_CHECK       1
     #define DISABLE_MIXING                  1
     #define DISABLE_WATER_QUALITY_CHECK     1
+    #define DISABLE_UV_REACTOR_MONITOR      1
+    #define DISABLE_RTC_CONFIG_ALARM        1
+
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rda3fb953ff72fc65fc6c8c6b91fd833114cb7cbf -r594e11a544c7d3f97f057a2d4c146f464e437948
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision da3fb953ff72fc65fc6c8c6b91fd833114cb7cbf)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 594e11a544c7d3f97f057a2d4c146f464e437948)
@@ -274,10 +274,8 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_CHECK_INLET_WATER;
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
-    BOOL isInletWaterReady = isWaterQualityGood();
-
 #ifndef DISABLE_DIALYSATE_CHECK
-    if ( isInletWaterReady )
+    if ( TRUE == isWaterQualityGood() )
 #endif
     {
         reservoirBaseWeight = getReservoirWeight( inactiveReservoir );
@@ -422,7 +420,7 @@
         }
 
         // if we've reached our target fill to volume (by weight), we're done filling - go back to re-circ mode
-        if ( hasTargetFillVolumeBeenReached( inactiveReservoir ) )
+        if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
         {
             F32 const filledVolume_mL = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
             F32 const integratedVolume_mL = totalROFlowRate_LPM * RO_FLOW_INTEGRATOR * ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rc5586e0292b8e988e89a7304f63be32afcad1466 -r594e11a544c7d3f97f057a2d4c146f464e437948
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision c5586e0292b8e988e89a7304f63be32afcad1466)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 594e11a544c7d3f97f057a2d4c146f464e437948)
@@ -727,7 +727,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_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;