Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r4ca9ae0989215af5b543637dc4b435f8b38480d2 -r77cf960846ef93d74fec68572fa596bf1f24bdc3
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4ca9ae0989215af5b543637dc4b435f8b38480d2)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 77cf960846ef93d74fec68572fa596bf1f24bdc3)
@@ -627,7 +627,7 @@
         {
             result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
 
-            if ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) )
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_EXPEDITE_PRE_TREATMENT ) )
             {
                 // If expedite pre-treatment flag is enabled, do not do the initial fill
                 result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r4ca9ae0989215af5b543637dc4b435f8b38480d2 -r77cf960846ef93d74fec68572fa596bf1f24bdc3
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4ca9ae0989215af5b543637dc4b435f8b38480d2)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 77cf960846ef93d74fec68572fa596bf1f24bdc3)
@@ -780,8 +780,8 @@
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
 
             // Done with flushing the concentrate pumps line
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS );    // NO_PARK_CONC_PUMPS );
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, PARK_CONC_PUMPS );  // NO_PARK_CONC_PUMPS );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
 
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
             setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
@@ -1192,8 +1192,8 @@
             break;
 
         case HEAT_DISINFECT_COMPLETE:
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS ); //NO_PARK_CONC_PUMPS );
-            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, PARK_CONC_PUMPS ); // NO_PARK_CONC_PUMPS );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
 
             // Although there is fluid in both reservoirs, but they are set to empty
             // to begin the transition of hot water from R1 to R2.
@@ -1355,8 +1355,8 @@
                 else
 #endif
                 {
-                    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, PARK_CONC_PUMPS );   //NO_PARK_CONC_PUMPS );
-                    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, PARK_CONC_PUMPS ); // NO_PARK_CONC_PUMPS );
+                    requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
+                    requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
                     stopHeater( DG_PRIMARY_HEATER );
                     stopHeater( DG_TRIMMER_HEATER );