Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r45b9096cf10c20adfaeac9e182ad75e1bf86d6e3 -r5ccf983b21101c07ec95537d5ad0291b450894bd
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 45b9096cf10c20adfaeac9e182ad75e1bf86d6e3)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 5ccf983b21101c07ec95537d5ad0291b450894bd)
@@ -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.
@@ -242,7 +242,7 @@
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-#ifdef 0
+#if 0
     // Reset the state machine
     // Note: the substate timers, and operation flags need to be reset on recovery, consider
     //       reinitializing the state variables, the resetting the state, by calling setModeFillStateTransition()