Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r34ae229d1508df89630f4dc5fbe9291d135f0686 -r702f24539279765e906d1c2764253e65ef2638a1
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 34ae229d1508df89630f4dc5fbe9291d135f0686)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 702f24539279765e906d1c2764253e65ef2638a1)
@@ -228,7 +228,7 @@
         // Since there is a single alarm value for all 4 load cells the persistence check must be
         // executed if ANY of the load cell values are out of range.  Only when all of the load
         // cells are in range should the persistence for the alarm be cleared.
-        weight                = getLoadCellWeight( ( LOAD_CELL_ID_T) sensorId );
+        weight = getLoadCellWeight( ( LOAD_CELL_ID_T) sensorId );
         if ( ( weight < LOAD_CELL_MIN_ALLOWED_WEIGHT_GRAMS ) || ( weight > LOAD_CELL_MAX_ALLOWED_WEIGHT_GRAMS ) )
         {
             isLoadCellOutOfRange = TRUE;
@@ -371,7 +371,7 @@
     {
         // Add old auto calibration offset to get back to actual weight value
         loadcells[ loadCellID ].autoCalOffset = ( loadcells[ loadCellID ].smallFilteredWeight.data + loadcells[ loadCellID ].autoCalOffset );
-        hasLoadCellBeenTared[ loadCellID ] = TRUE;
+        hasLoadCellBeenTared[ loadCellID ]    = TRUE;
     }
     else
     {
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r702f24539279765e906d1c2764253e65ef2638a1
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 702f24539279765e906d1c2764253e65ef2638a1)
@@ -209,9 +209,9 @@
                 if ( VALVE_STATE_OPEN == getValveStateName( VPI ) )
                 {
                     // TODO define the PRS
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MIN_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH, isPressureTooHigh, pressure, MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG );
                     // TODO define the PRS
-                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
+                    checkPersistentAlarm( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW, isPressureTooLow, pressure, MAX_INLET_WATER_PRESSURE_WARNING_LOW_PSIG );
                 }
                 break;
 
@@ -587,7 +587,14 @@
                 // Bitwise OR the current pressure sensor with the total pressure sensor to persistent alarm check
                 // Remember the ID of the pressure sensor that is out of range. The ID is converted to float since the check persistent alarm function
                 // accepts only floats.
-                pressureReading       = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI();
+                pressureReading = getMeasuredDGPressure( sensorId ) + getBaroPressurePSI();
+
+                if ( OVERRIDE_KEY == pressures[ sensorId ].override )
+                {
+                    // If the pressure override key is on, do not add the baro sensor to make it absolute. The overridden value is the absolute value.
+                    pressureReading = getMeasuredDGPressure( sensorId );
+                }
+
                 if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE_PSIA ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE_PSIA ) )
                 {
                     isPressureOutOfRange = TRUE;
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb8f298547eb578000b3ff3cf55732fda7a689ce0 -r702f24539279765e906d1c2764253e65ef2638a1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b8f298547eb578000b3ff3cf55732fda7a689ce0)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 702f24539279765e906d1c2764253e65ef2638a1)
@@ -731,10 +731,9 @@
     {
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
 
-        dialysateFillStartTime        = getMSTimerCount();
-
-        fillStatus.isThisFirstFill    = FALSE;
-        result                        = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
+        dialysateFillStartTime     = getMSTimerCount();
+        fillStatus.isThisFirstFill = FALSE;
+        result                     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     }
 
     return result;
@@ -925,7 +924,7 @@
 
     if ( FALSE == areInletWaterConditionsAlarmsActive() )
     {
-        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+
         havePauseActuatorsBeenSet = FALSE;
         result                    = DG_FILL_MODE_STATE_START;
     }