Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r59b7b1cd099ab5a5e943fb5307aec264cbadb51a -r1b04f01736d4a9dcbb0b1d716fcb55dabc5d230d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 59b7b1cd099ab5a5e943fb5307aec264cbadb51a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 1b04f01736d4a9dcbb0b1d716fcb55dabc5d230d)
@@ -80,7 +80,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r59b7b1cd099ab5a5e943fb5307aec264cbadb51a -r1b04f01736d4a9dcbb0b1d716fcb55dabc5d230d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 59b7b1cd099ab5a5e943fb5307aec264cbadb51a)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1b04f01736d4a9dcbb0b1d716fcb55dabc5d230d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeHeatDisinfect.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      05-Jun-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      28-Jun-2023
 *
 * @author  (original)  Sean
 * @date    (original)  20-Apr-2020
@@ -94,7 +94,7 @@
 #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_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           ( 5 * MS_PER_SECOND )                                       ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
+#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 10 * MS_PER_SECOND )                                      ///< Reservoirs 1 & 2 maximum volume out of range timeout during heat disinfect.
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML            150.0F                                                      ///< Reservoirs 1 & 2 maximum allowed volume change when full during heat disinfect.
 #define POST_HEAT_DISINFECT_WAIT_TIME_MS           ( 3 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Heat disinfect final wait time before flushing the system in milliseconds.
 #define HEAT_DISINFECT_MAX_TEMP_GRADIENT_C         15.0F                                                       ///< Heat disinfect maximum allowed temperature gradient in between hottest and coldest sensors.