Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e -rc7729561800e04459103cfe472fa990e77927a04
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision c7729561800e04459103cfe472fa990e77927a04)
@@ -199,7 +199,8 @@
  *************************************************************************/
 static void setModeGenPTransition( FP_GENP_MODE_STATE_T state )
 {
-    F32 initDutyCycle = 0.0F;
+    F32 initDutyCycle       = 0.0F;
+    F32 currentDutyCyclePct = 0.0F;
 
     // Execute on running state
     switch( state )
@@ -220,7 +221,8 @@
             timeInState = getMSTimerCount();
             if ( TRUE == isBoostPumpInstalled() )
             {
-                F32 currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT();
+                currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT();
+
                 setBoostPumpTargetDutyCycle( currentDutyCyclePct  );
             }
             break;
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -recb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e -rc7729561800e04459103cfe472fa990e77927a04
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision ecb538c8bf67a7a62d11a1186a9ef5fe53cf9d9e)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision c7729561800e04459103cfe472fa990e77927a04)
@@ -38,7 +38,7 @@
 #define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 500 )                                                                 ///< Filter conductivity temperature data for given time
 #define SIZE_OF_FLOW_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_FLOW_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
-#define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         300                                                                     ///< RO rejection ratio moving average number of samples.
+#define RO_RR_MOVING_AVG_NUM_OF_SAMPLES         30                                                                      ///< RO rejection ratio moving average number of samples.
 #define FRACTION_TO_PERCENT_CONVERSION_FACTOR   100.0F                                                                  ///< RO rejection ratio factor to percentage conversion factor value
 #define RO_RR_SAMPLE_COLLECTION_INTERVAL        10                                                                      ///< Collect RO rejection ratio sample for every 10th time in priority task