Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r1d44cf33cf4461b81b19a8ab0e402c609649786b -r4545a748791772cb1f21ea5e8fbbf661b7f8a062
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 1d44cf33cf4461b81b19a8ab0e402c609649786b)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
@@ -134,7 +134,7 @@
  * @param loadCellID : ID of load cell to get filtered weight for.
  * @return the filtered load cell weight for the given load cell ID.
  *************************************************************************/
-F32 getLoadCellFilteredWeight( U32 loadCellID )
+F32 getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID )
 {
     F32 result = 0;
 
Index: firmware/App/Controllers/LoadCell.h
===================================================================
diff -u -r45dcb7966d1996f533eb6ca321637db16535182e -r4545a748791772cb1f21ea5e8fbbf661b7f8a062
--- firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 45dcb7966d1996f533eb6ca321637db16535182e)
+++ firmware/App/Controllers/LoadCell.h	(.../LoadCell.h)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
@@ -45,7 +45,7 @@
 void initLoadCell( void );                      // Initialize the LoadCell module.
 void execLoadCell( void );                      // Execute the LoadCell monitor.
 
-F32  getLoadCellFilteredWeight( U32 loadCellID );
+F32  getLoadCellFilteredWeight( LOAD_CELL_ID_T loadCellID );
 
 BOOL testSetLoadCellOverride( U32 loadCellID, F32 value );
 BOOL testResetLoadCellOverride( U32 loadCellID );
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r1d44cf33cf4461b81b19a8ab0e402c609649786b -r4545a748791772cb1f21ea5e8fbbf661b7f8a062
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 1d44cf33cf4461b81b19a8ab0e402c609649786b)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
@@ -66,7 +66,6 @@
 static OVERRIDE_U32_T pressuresDataPublishInterval = { PRESSURES_DATA_PUB_INTERVAL, PRESSURES_DATA_PUB_INTERVAL, 0, 0 }; ///< interval (in ms/task interval) at which to publish pressures data to CAN bus.
 static OVERRIDE_F32_T pressures[ NUM_OF_PRESSURE_SENSORS ];                     ///< Measured pressure from sensors.
 
-static S32 measuredPressureReadingsRaw[ NUM_OF_PRESSURE_SENSORS ];              ///< Latest measured raw pressure sensor readings.
 static S32 measuredPressureReadingsSum[ NUM_OF_PRESSURE_SENSORS ];              ///< Raw pressure sensor sums for averaging.
 static U32 pressureFilterCounter = 0;                                           ///< used to schedule pressure sensor filtering.
 
@@ -101,7 +100,6 @@
         pressures[ i ].override = OVERRIDE_RESET;
 
         measuredPressureReadingsSum[ i ] = 0;
-        measuredPressureReadingsRaw[ i ] = 0;
     }
 
     pressuresState = PRESSURE_INIT_STATE;
@@ -169,6 +167,7 @@
 static PRESSURE_STATE_T handlePressuresContReadState( void )
 {
     PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE;
+    S32 measuredPressureReadingsRaw[ NUM_OF_PRESSURE_SENSORS ];
 
     // get latest raw pressure readings
     measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_INLET ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO;
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61 -r4545a748791772cb1f21ea5e8fbbf661b7f8a062
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 738afd1d72ec8da1c5bd347b9263a2c3ca2d8a61)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
@@ -51,8 +51,8 @@
 #define MIN_RO_PUMP_PWM_DUTY_CYCLE          0.00                ///< min duty cycle
 
 #define ROP_CONTROL_INTERVAL                ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< interval (ms/task time) at which the RO pump is controlled
-#define ROP_P_COEFFICIENT                   0.005               ///< P term for RO pump control
-#define ROP_I_COEFFICIENT                   0.0025              ///< I term for RO pump control
+#define ROP_P_COEFFICIENT                   0.0020              ///< P term for RO pump control
+#define ROP_I_COEFFICIENT                   0.0015              ///< I term for RO pump control
 
 #define FLOW_SENSOR_ZERO_READING            0xFFFF              ///< Flow sensor reading indicates zero flow (or flow lower than can be detected by sensor)
 
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rbbf1e3736be03a4f041ace57e0f95e23caf472dd -r4545a748791772cb1f21ea5e8fbbf661b7f8a062
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision bbf1e3736be03a4f041ace57e0f95e23caf472dd)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4545a748791772cb1f21ea5e8fbbf661b7f8a062)
@@ -156,7 +156,11 @@
 
 
     // determine which load cell to use for fill volume - we want weight of inactive reservoir
+#ifndef BETA_V1_BUILD
+    if ( RESERVOIR_2 == getActiveReservoir() )
+#else
     if ( RESERVOIR_1 == getActiveReservoir() )
+#endif
     {
         fillWeightLoadCell = LOAD_CELL_B1;
     }