Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rd0536d759cb33f099357033c3429401ff1637d26 -r61b60913fe96f6b4436211f76c443e8d518006d1
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d0536d759cb33f099357033c3429401ff1637d26)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 61b60913fe96f6b4436211f76c443e8d518006d1)
@@ -599,7 +599,7 @@
 
     // Park concentrate pump too if requested
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONCENTRATE_PUMPS_PARK ) )
     {
         if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
         {
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r2c237242d3dfc0d4e952f0cc2ebd8e6d6a826243 -r61b60913fe96f6b4436211f76c443e8d518006d1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2c237242d3dfc0d4e952f0cc2ebd8e6d6a826243)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 61b60913fe96f6b4436211f76c443e8d518006d1)
@@ -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.