Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re41df6b9a323e27c7d779f602579bbcf457ffa6d -rbc2f07d1ccac37e4cb18a21bfe096db94e72a151
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e41df6b9a323e27c7d779f602579bbcf457ffa6d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision bc2f07d1ccac37e4cb18a21bfe096db94e72a151)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      17-May-2023
+* @date    (last)      02-Jun-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -1024,9 +1024,12 @@
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_FLOW_VS_LOAD_CELL_CHECK_IN_FILL ) != SW_CONFIG_ENABLE_VALUE )
 #endif
         {
-            if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )  // SRSDG 240
+            if ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML )
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, getIntegratedVolumeML() );
+                if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )  // SRSDG 240
+                {
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, getIntegratedVolumeML() );
+                }
             }
         }
 
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -ra12e1212c1cf49011ed8d65beaf9416ca18ffe98 -rbc2f07d1ccac37e4cb18a21bfe096db94e72a151
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision a12e1212c1cf49011ed8d65beaf9416ca18ffe98)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision bc2f07d1ccac37e4cb18a21bfe096db94e72a151)
@@ -8,7 +8,7 @@
 * @file    ModeHeatDisinfectActiveCool.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      16-May-2023
+* @date    (last)      31-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  18-Dec-2022
@@ -1108,10 +1108,19 @@
 {
     F32 THdTemperatureC = getTemperatureValue( TEMPSENSORS_HEAT_DISINFECT );
 
-    if ( ( THdTemperatureC <= ROF_ACTIVE_COOL_TARGET_TEMP_C ) && ( FALSE == tempBelowTarget.hasTempTargetTimeBeenSet ) )
+    if ( THdTemperatureC <= ROF_ACTIVE_COOL_TARGET_TEMP_C )
     {
+        // If THd is below the target and the timer for stable temperature has not been set, set it
+        if ( FALSE == tempBelowTarget.hasTempTargetTimeBeenSet )
+        {
+            tempBelowTarget.tempBelowTargetStartTimeMS = getMSTimerCount();
+            tempBelowTarget.hasTempTargetTimeBeenSet   = TRUE;
+        }
+    }
+    else
+    {
+        // The temperature is still above the target so keep reseting the timer
         tempBelowTarget.tempBelowTargetStartTimeMS = getMSTimerCount();
-        tempBelowTarget.hasTempTargetTimeBeenSet   = TRUE;
     }
 
     if ( DG_RESERVOIR_BELOW_TARGET == rsrvrsStatus.rsrvr[ rsrvrID ].rStatus )
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r43f57e52a9a31e5154579178e847db3a6917b93c -rbc2f07d1ccac37e4cb18a21bfe096db94e72a151
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 43f57e52a9a31e5154579178e847db3a6917b93c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision bc2f07d1ccac37e4cb18a21bfe096db94e72a151)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      20-May-2023
+* @date    (last)      31-May-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019