Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rf20c3a459d0fa96d8703b34f96b8795af5744ea0 -reaa0ce5fe4890d9c7ff14d14828ea90209c1ad97
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision f20c3a459d0fa96d8703b34f96b8795af5744ea0)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision eaa0ce5fe4890d9c7ff14d14828ea90209c1ad97)
@@ -429,8 +429,10 @@
     else
     {
         if ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE )
-        //Alarm when pressure is not in range
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+        {
+            //Alarm when pressure is not in range
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+        }
     }
 
     return state;
@@ -600,7 +602,7 @@
     // Check fresh and spent dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) &&
          ( ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG ) ) ||
-         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) != TRUE ) )
+         ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DISABLE_BC_PRESSURE_ALARMS ) ) )
     {
         // Valve control for state 2 fill
         valveControlForBCState2FillStart();
Index: firmware/App/Drivers/PressureSensor.c
===================================================================
diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -reaa0ce5fe4890d9c7ff14d14828ea90209c1ad97
--- firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
+++ firmware/App/Drivers/PressureSensor.c	(.../PressureSensor.c)	(revision eaa0ce5fe4890d9c7ff14d14828ea90209c1ad97)
@@ -32,8 +32,8 @@
 #define PRES_SENSORS_COUNT_ERROR_TIMEOUT_MS         ( 2 * MS_PER_SECOND )                               ///< Pressure sensors read and error count timeout in milliseconds.
 #define HIGH_PRES_MAX_PSI                           145.038F                                            ///< Convert pressure to PSI for 10 bar pressure sensor
 #define LOW_PRES_MAX_PSI                            50.7632F                                            ///< Convert pressure to PSI for 3.5 bar pressure sensor
-#define PRES_MIN_PSI                                0.0F                                                ///< Minimum value for PSI conversion
-#define PRES_MIN_PSI_ALPHA                          -14.5038F                                           ///< Minimum value for PSI conversion
+#define PRES_MIN_PSI_ALPHA                          0.0F                                                ///< Minimum value for PSI conversion for alpha systems
+#define PRES_MIN_PSI                                -14.5038F                                           ///< Minimum value for PSI conversion
 #define ONE_BAR_TO_MILLI_BAR                        1000                                                ///< 1 bar to milli-bar conversion.
 #define COUNTS_TO_MILLI_BAR                         100                                                 ///< Counts to milli-bar conversion.
 #define BAR_TO_MMHG                                 ( 750.062F )                                        ///< Conversion factor for converting bar to mmHg.