Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -rda0deea71ed5770d98a00943369b9c17321e139f -r201bc72d7f3f75f27662c66fa2f0c9851584f6f1
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision da0deea71ed5770d98a00943369b9c17321e139f)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 201bc72d7f3f75f27662c66fa2f0c9851584f6f1)
@@ -36,7 +36,7 @@
 
 #define THERMISTORS_DATA_PUBLISH_INTERVAL       ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )              ///< Thermistors publish data time interval.
 #define THERMISTORS_ADC_READ_INTERVAL           ( MS_PER_SECOND / ( 2 * TASK_GENERAL_INTERVAL ) )      ///< Thermistors ADC read time interval.
-#define ADC_FPGA_READ_DELAY_COUNT               1.0F                                                   ///< FGPA read delay upon startup.
+#define ADC_FPGA_READ_DELAY_COUNT               1                                                      ///< FPGA read delay upon startup.
 #define TWELVE_BIT_RESOLUTION                   4096U                                                  ///< 12 bit resolution conversion.
 #define TEN_BIT_RESOLUTION                      1024U                                                  ///< 10 bit resolution conversion.
 #define THERMISTOR_REFERENCE_VOLTAGE            3.0F                                                   ///< Thermistors source voltage.
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r11c24f8ff3e3a7247ac69ca90f244d12727e25a0 -r201bc72d7f3f75f27662c66fa2f0c9851584f6f1
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 11c24f8ff3e3a7247ac69ca90f244d12727e25a0)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 201bc72d7f3f75f27662c66fa2f0c9851584f6f1)
@@ -54,7 +54,7 @@
 
 // ********** private data **********
 
-static U32 dataPublishCounter;                                                                 ///< Used to schedule gen idle data publication to CAN bus.
+static U32 dataPublishCounter = 0;                                                             ///< Used to schedule gen idle data publication to CAN bus.
 static DG_GEN_IDLE_MODE_STATE_T genIdleState;                                                  ///< Currently active generation idle state.
 // NOTE: the bad fill state must be initialized here and not in the transition function since in case of a bad fill, the transition function is called
 // several times to drain and fill and handle a bad fill.
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r573e1540c4efc3cecb554dfd157e4a31fb90cc88 -r201bc72d7f3f75f27662c66fa2f0c9851584f6f1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 573e1540c4efc3cecb554dfd157e4a31fb90cc88)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 201bc72d7f3f75f27662c66fa2f0c9851584f6f1)
@@ -24,6 +24,7 @@
 #include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
 #include "ModeFill.h"
+#include "ModeGenIdle.h"
 #include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "NVDataMgmt.h"
@@ -149,6 +150,8 @@
     // Initialize the reservoirs parameters for another treatment.
     // This is to make sure the boolean flag for the first fill is set to TRUE.
     initReservoirs();
+    // Clear bad fill flag
+    setBadAvgConductivityDetectedFlag( FALSE );
 
     // Send DG usage data to HD
     // The message ID will not be put here because the messages list script will pick this up for another send command