Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rfae0f1d9a51c7a6a13d282440469663d9bfc7dec -r152aacee2eb078fb519724e1305630f5b5b4cb91
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fae0f1d9a51c7a6a13d282440469663d9bfc7dec)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 152aacee2eb078fb519724e1305630f5b5b4cb91)
@@ -48,7 +48,7 @@
 
 #define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML      125             ///< Fill reservoir to this volume minimum to prep volume during development.
 #define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
-#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1200            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      600             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML          1500            ///< Fill reservoir to this volume minimum to prep volume during development.
 
@@ -1180,12 +1180,9 @@
             // Start tracking flush cycles, flushComplete => don't drain again, this completes the final fill.
             if ( FALSE == reservoirStatus[ inactiveReservoir ].flushComplete )
             {
-                if ( reservoirStatus[ inactiveReservoir ].flushCount > 0 )
+                reservoirStatus[ inactiveReservoir ].flushCount--;
+                if ( 0 == reservoirStatus[ inactiveReservoir ].flushCount )
                 {
-                    reservoirStatus[ inactiveReservoir ].flushCount -= 1;
-                }
-                else // 0 == reservoirStatus[ inactiveReservoir ].flushCount
-                {
                     reservoirStatus[ inactiveReservoir ].flushComplete = TRUE;
                 }
             }
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r023566f1e1c9a4829eca62d6c0ef1c1da2f12292 -r152aacee2eb078fb519724e1305630f5b5b4cb91
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 023566f1e1c9a4829eca62d6c0ef1c1da2f12292)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 152aacee2eb078fb519724e1305630f5b5b4cb91)
@@ -58,7 +58,7 @@
 #define PURGE_AIR_TIME_OUT_COUNT                            ( 240 * MS_PER_SECOND )                            ///< Time period count for purge air time out.
 #define PRIME_SALINE_DIALYZER_TIME_OUT_COUNT                ( 60 * MS_PER_SECOND )                             ///< Time period count for prime saline dialyzer time out.
 #define LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME               (  1 * MS_PER_SECOND )                             ///< Time load cell reading steady state detection sampling time in seconds.
-#define PRIME_DIALYSATE_BYPASS_TIME_LIMIT                   ( 15 * MS_PER_SECOND )                             ///< Time limit for priming dialysate bypass circuit.
+#define PRIME_DIALYSATE_BYPASS_TIME_LIMIT                   ( 8 * MS_PER_SECOND )                              ///< Time limit for priming dialysate bypass circuit.
 #define STEADY_VOLUME_COUNT_SEC                             ( 10000 / LOAD_CELL_STEADY_VOLUME_SAMPLING_TIME )  ///< Counter must be greater than 10 seconds before steady volume is true.
 #define STEADY_VOLUME_TIME_DEADLINE_MS                      ( 55 * MS_PER_SECOND )                             ///< Time in msec for the steady volume deadline time out.
 
@@ -871,7 +871,7 @@
     {
         DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
-        rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_1;
+        rsrvrCmd.reservoirID            = (U32)DG_RESERVOIR_2;
         rsrvrCmd.useLastTrimmerHeaterDC = FALSE;
 
         cmdSetDGActiveReservoir( &rsrvrCmd );