Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -646,8 +646,8 @@
  *************************************************************************/
 static void calcMeasuredPumpsSpeed( CONCENTRATE_PUMPS_T pumpId, U16 pulseWidthCount )
 {
-    F32 pulseWidthInMicroSeconds            = (F32)pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
-    BOOL isPulseWidthOut                    = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
+    F32 pulseWidthInMicroSeconds = (F32)pulseWidthCount * CONCENTRATE_PUMP_HALL_SENSE_PERIOD_RESOLUTION;
+    BOOL isPulseWidthOut         = ( pulseWidthInMicroSeconds <= (F32)CONCENTRATE_PUMP_MIN_ALLOWED_HALL_SENSOR_COUNT ? TRUE : FALSE );
 
     concentratePumps[ pumpId ].pulseWidthUS = pulseWidthInMicroSeconds;
 
@@ -658,8 +658,7 @@
     {
         concentratePumps[ pumpId ].measuredPumpSpeed.data = ( US_PER_SECOND / pulseWidthInMicroSeconds ) * CONCENTRATE_PUMP_VOLUME_PER_PULSE * SEC_PER_MIN;
     }
-
-    if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
+    else if ( CONCENTRATE_PUMP_ZERO_FLOW_RATE == pulseWidthCount )
     {
         concentratePumps[ pumpId ].measuredPumpSpeed.data = 0.0;
     }
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -575,7 +575,9 @@
         F32 targetTemperature          = heatersStatus[ DG_TRIMMER_HEATER ].targetTemp;
         F32 targetFlowLPM              = heatersStatus[ DG_TRIMMER_HEATER ].targetFlow;
         F32 dutyCycle                  = calculateTrimmerHeaterDutyCycle( targetTemperature, outletRedundantTemperature, targetFlowLPM, TRUE );
+
         trimmerHeaterControlCounter    = 0;
+
         setHeaterDutyCycle( DG_TRIMMER_HEATER, dutyCycle );
     }
 
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -178,7 +178,7 @@
 static void processADCRead( U32 sensorIndex, S32 adc );
 static void publishTemperatureSensorsData( void );
 static void monitorTemperatureSenors( void );
-static void adjustTemperatureSensorsV3DVTRefResistance( void );
+static void adjustTemperatureSensorsRefResistance( void );
 
 /*********************************************************************//**
  * @brief
@@ -352,7 +352,7 @@
 void execTemperatureSensors( void )
 {
     // Check the status of the software configuration
-    adjustTemperatureSensorsV3DVTRefResistance();
+    adjustTemperatureSensorsRefResistance();
 
     // Read the sensors all the time
     switch ( tempSensorsExecState )
@@ -990,13 +990,13 @@
 
 /*********************************************************************//**
  * @brief
- * The adjustTemperatureSensorsV3DVTRefResistance function adjusts the temperature
+ * The adjustTemperatureSensorsRefResistance function adjusts the temperature
  * sensors V3 or DVT reference resistance values.
  * @details Inputs: tempSensors
  * @details Outputs: tempSensors
  * @return none
  *************************************************************************/
-static void adjustTemperatureSensorsV3DVTRefResistance( void )
+static void adjustTemperatureSensorsRefResistance( void )
 {
     // The default are DVT changes
     U32 primaryAndCondSensorsRefResistance = PRIMARY_HEATER_EXT_TEMP_SENSORS_REF_RESISTANCE;
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -336,7 +336,7 @@
     getNVRecord2Driver( GET_INF_HEATERS_RECORD, (U08*)&heaterInfo, sizeof( DG_HEATERS_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
     // If the data in the NV data management was not initialized properly, set it to 0 otherwise, set the average flow rate
-    fillStatus.fillFlowRateAverageLPM       = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
+    fillStatus.fillFlowRateAverageLPM    = ( heaterInfo.averageFillFlow < NEARLY_ZERO ? 0.0 : heaterInfo.averageFillFlow );
     fillStatus.fillFlowRateRunningSum    = 0.0;
     fillStatus.fillSampleCounter         = 0;
     fillStatus.fillTemperatureRunningSum = 0.0;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rf1cb4be5fb8201cec188589e683c8bf20d895ec0 -rbdbc27dc5dc85c84f71ea1bbb4e465317a6d11de
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision bdbc27dc5dc85c84f71ea1bbb4e465317a6d11de)
@@ -759,7 +759,7 @@
     fpgaReadCmdBuffer[ 0 ] = FPGA_READ_CMD_CODE;
     fpgaReadCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
     fpgaReadCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
-    fpgaReadCmdBuffer[ 3 ] = fpgaReadByteSize; //sizeof( DG_FPGA_SENSORS_T );
+    fpgaReadCmdBuffer[ 3 ] = fpgaReadByteSize;
     crc = crc16( fpgaReadCmdBuffer, FPGA_READ_CMD_HDR_LEN );
     fpgaReadCmdBuffer[ 4 ] = GET_MSB_OF_WORD( crc );
     fpgaReadCmdBuffer[ 5 ] = GET_LSB_OF_WORD( crc );