Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r9b1ae2d7327c0b865be12685641dea8668368ac1 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9b1ae2d7327c0b865be12685641dea8668368ac1)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -75,6 +75,7 @@
 #define EMSTAT_CPO_OR_CD2_INDEX                         1                                           ///< Emstat board CPo index number.
 
 #define EMSTAT_PACKAGE_BUFFER_SIZE                      50                                          ///< EmStat package buffer size
+#define EMSTAT_RX_FIFO_COUNT_MASK                       0x7FFF                                      ///< EmStat Rx fifo count mask
 
 #define DATA_PUBLISH_COUNTER_START_COUNT                40                                          ///< Data publish counter start count.
 #define COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD       ( 1 * MS_PER_SECOND )                       ///< Conductivity sensor bad status persistence period.
@@ -519,24 +520,13 @@
 {
     U08 emstatByte     = 0;
     U16 rxFifoCount    = 0;
-    static U32 maxRxFifoCount = 0;
-    static U32 numRxFifoEmpty = 0;
-    static U32 numRxFifoCheck = 0;
 
     switch ( board )
     {
         // TODO should check Rx FIFO to see if a character exists?
         case EMSTAT_CPI_CPO_BOARD:
             // Check for continuous incoming bytes
-            rxFifoCount = getFPGAEmstatCPiCPoRxFifoCount() & 0x7FFF;
-            numRxFifoCheck++;
-            if (numRxFifoCheck == 10000)
-            {
-                maxRxFifoCount = 0;
-                numRxFifoEmpty = 0;
-            }
-            if (rxFifoCount > maxRxFifoCount) maxRxFifoCount = rxFifoCount;
-            if (rxFifoCount == 0) numRxFifoEmpty++;
+            rxFifoCount = getFPGAEmstatCPiCPoRxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;
 
             checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CPI_CPO_COND_SENSORS, rxFifoCount );
 
@@ -550,7 +540,7 @@
 
         case EMSTAT_CD1_CD2_BOARD:
             // Check for continuous incoming bytes
-            rxFifoCount = getFPGAEmstatCD1CD2RxFifoCount() & 0x7FFF;;
+            rxFifoCount = getFPGAEmstatCD1CD2RxFifoCount() & EMSTAT_RX_FIFO_COUNT_MASK;;
             checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_CD2_COND_SENSORS, rxFifoCount );
 
             // Only process the sensor read if there is a new byte
@@ -582,11 +572,8 @@
     switch ( emstatByte )
     {
         case 'P':
-            if ( FALSE == readPackage->packageStarted)
-            {
-                readPackage->packageStarted = TRUE;
-                readPackage->packageIndex   = 0;
-            }
+            readPackage->packageStarted = TRUE;
+            readPackage->packageIndex   = 0;
             break;
 
         case ';':
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rc4a05fb43aae836fb6ea31c860c2bc233ebd9dc9 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision c4a05fb43aae836fb6ea31c860c2bc233ebd9dc9)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -1010,8 +1010,7 @@
     else
 #endif
     {
-        // TODO this is not working on DVT-002
-        // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC
+       // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC
         checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCReadCount() );
     }
 
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rc4a05fb43aae836fb6ea31c860c2bc233ebd9dc9 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision c4a05fb43aae836fb6ea31c860c2bc233ebd9dc9)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -915,8 +915,8 @@
         checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, readCount );
         processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT,   getFPGATHdTemp() );
 
-            // Make sure the baro sensor coefficients are not corrupted
-            checkBaroSensorCRC();
+        // Make sure the baro sensor coefficients are not corrupted
+        checkBaroSensorCRC();
 
         processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD, getFPGATHdInternalTemp() );
 
Index: firmware/App/Controllers/Voltages.h
===================================================================
diff -u -r9b1ae2d7327c0b865be12685641dea8668368ac1 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision 9b1ae2d7327c0b865be12685641dea8668368ac1)
+++ firmware/App/Controllers/Voltages.h	(.../Voltages.h)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -34,8 +34,8 @@
 /// Enumeration of voltages monitored by this module.
 typedef enum Voltages
 {
-    MONITORED_LINE_FIRST_VOLTAGE = 0,                                           ///< First voltage in list
-    MONITORED_LINE_24V_MAIN = MONITORED_LINE_FIRST_VOLTAGE,                     ///< Main voltage (24V) (non-isolated)
+    MONITORED_LINE_24V_MAIN = 0,                                                ///< First voltage in list
+    MONITORED_LINE_FIRST_VOLTAGE = MONITORED_LINE_24V_MAIN,                     ///< Main voltage (24V) (non-isolated)
     MONITORED_LINE_1_8V_FPGA,                                                   ///< FPGA logic voltage (1.8V)
     MONITORED_LINE_1V_FPGA,                                                     ///< FPGA reference voltage (1V)
     MONITORED_LINE_3_3V_SENSORS,                                                ///< Sensors voltage (3.3V)
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r4e5e338d28d8f856870e37df079df1d931b46587 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 4e5e338d28d8f856870e37df079df1d931b46587)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -921,6 +921,12 @@
  *************************************************************************/
 void execFPGAClockSpeedTest( void )
 {
+    /* DEBUG WARNING
+     * It may be necessary to comment out the following
+     * code to prevent the  alarm from occurring while
+     * debugging.
+     */
+
     static U16 currentFPGATimerCount_ms = 0;
     static U32 currentTimerCount_ms     = 0;
 
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r4e5e338d28d8f856870e37df079df1d931b46587 -rb18590ffa370d1e22f32a89510a0005fcb16408b
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 4e5e338d28d8f856870e37df079df1d931b46587)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision b18590ffa370d1e22f32a89510a0005fcb16408b)
@@ -117,7 +117,12 @@
     {
         // ignore expired watchdog until after watchdog POST
         if ( getCurrentOperationMode() != DG_MODE_INIT )
-        {
+        {
+            /* DEBUG WARNING
+             * It may be necessary to comment out the following
+             * line to prevent the  alarm from occurring while
+             * debugging.
+             */
             activateAlarmNoData( ALARM_ID_DG_WATCHDOG_EXPIRED );
         }
     }