Index: firmware/App/Controllers/Thermistors.c
===================================================================
diff -u -r721bd715bef050760e5c0f79044d1cba642c8354 -r3727453ce70f85af78902e3726073cea37969c8d
--- firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 721bd715bef050760e5c0f79044d1cba642c8354)
+++ firmware/App/Controllers/Thermistors.c	(.../Thermistors.c)	(revision 3727453ce70f85af78902e3726073cea37969c8d)
@@ -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                                                      ///< FGPA 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 -re52fb9e8ad2d770523af286fa8d756595c3cac5e -r3727453ce70f85af78902e3726073cea37969c8d
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision e52fb9e8ad2d770523af286fa8d756595c3cac5e)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 3727453ce70f85af78902e3726073cea37969c8d)
@@ -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/ModeHeatDisinfect.c
===================================================================
diff -u -r8a89e041755b26fad2530e1b8ad2cfeed1937b0a -r3727453ce70f85af78902e3726073cea37969c8d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 8a89e041755b26fad2530e1b8ad2cfeed1937b0a)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 3727453ce70f85af78902e3726073cea37969c8d)
@@ -94,7 +94,7 @@
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
 #define HEAT_DISINFECT_TARGET_RO_FLOW_LPM          1.3F                                                        ///< Heat disinfect target RO flow rate in L/min.
-#define HEAT_DISINFECT_TARGET_RO_FLOW_TRANSFER_LPM 0.5F                                                        ///< Heat disinfect target RO flow rate in L/min when transferring between reservoirs.
+#define HEAT_DISINFECT_TARGET_RO_FLOW_TRANSFER_LPM 0.4F                                                        ///< Heat disinfect target RO flow rate in L/min when transferring between reservoirs.
 #define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI         30                                                          ///< Heat disinfect maximum RO pressure in psi.
 #define HEAT_DISINFECT_START_TEMP_TIMEOUT_MS       ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Heat disinfect reaching to minimum temperature timeout in milliseconds.
 #define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r2f6d34bea9698f8847c5076d694ff4d49ca6ded0 -r3727453ce70f85af78902e3726073cea37969c8d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2f6d34bea9698f8847c5076d694ff4d49ca6ded0)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3727453ce70f85af78902e3726073cea37969c8d)
@@ -149,6 +149,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