Index: firmware/App/Modes/FPModes/ModeGenPermeate.c
===================================================================
diff -u -rc7729561800e04459103cfe472fa990e77927a04 -r1abceb4d33eba70426f0bad68060beaf70210cbb
--- firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision c7729561800e04459103cfe472fa990e77927a04)
+++ firmware/App/Modes/FPModes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 1abceb4d33eba70426f0bad68060beaf70210cbb)
@@ -199,8 +199,7 @@
  *************************************************************************/
 static void setModeGenPTransition( FP_GENP_MODE_STATE_T state )
 {
-    F32 initDutyCycle       = 0.0F;
-    F32 currentDutyCyclePct = 0.0F;
+    F32 initDutyCycle = 0.0F;
 
     // Execute on running state
     switch( state )
@@ -221,7 +220,7 @@
             timeInState = getMSTimerCount();
             if ( TRUE == isBoostPumpInstalled() )
             {
-                currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT();
+                F32 currentDutyCyclePct = getCurrentBoostPumpDutyCyclePCT();
 
                 setBoostPumpTargetDutyCycle( currentDutyCyclePct  );
             }
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rc7729561800e04459103cfe472fa990e77927a04 -r1abceb4d33eba70426f0bad68060beaf70210cbb
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision c7729561800e04459103cfe472fa990e77927a04)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 1abceb4d33eba70426f0bad68060beaf70210cbb)
@@ -119,6 +119,8 @@
     roRRAvg.override                  = OVERRIDE_RESET;
     roRRSampleIntervalCounter         = 0;
 
+    memset( &roRRSamples, 0, RO_RR_MOVING_AVG_NUM_OF_SAMPLES );
+
     // Initialize override structures for each conductivity sensor
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
@@ -365,11 +367,7 @@
     if ( ++roRRSampleIntervalCounter >= RO_RR_SAMPLE_COLLECTION_INTERVAL )
     {
         // Filter RO rejection ratio
-        if ( roRRCount >= RO_RR_MOVING_AVG_NUM_OF_SAMPLES )
-        {
-            roRRRunningSum -= roRRSamples[ roRRSamplesNextIndex ];
-        }
-
+        roRRRunningSum                         -= roRRSamples[ roRRSamplesNextIndex ];
         roRR                                   = getRORejectonRatio();
         roRRSamples[ roRRSamplesNextIndex ]    = roRR;
         roRRRunningSum                         += roRR;