Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r34e1ca4e998f57d2e962709cd272a296dc4d8c50 -r4859dab16682b54caf2eac157443fc6e60f0cd70
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 34e1ca4e998f57d2e962709cd272a296dc4d8c50)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 4859dab16682b54caf2eac157443fc6e60f0cd70)
@@ -946,7 +946,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check both spent and fresh side fill is complete
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
@@ -1115,7 +1115,7 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check switching cycle time or pressure check for valve closure
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) )
+    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStalbilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
     {
         // close the valves
         valveControlForBCState2FillEnd();
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r34e1ca4e998f57d2e962709cd272a296dc4d8c50 -r4859dab16682b54caf2eac157443fc6e60f0cd70
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 34e1ca4e998f57d2e962709cd272a296dc4d8c50)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 4859dab16682b54caf2eac157443fc6e60f0cd70)
@@ -565,7 +565,7 @@
 
     if ( dialFlowrate >= LOW_DIAL_FLOW_RATE )
     {
-        //  linear releationship seen against high dialysate flowrate Vs DeltaTemp
+        //  linear relationship seen against high dialysate flowrate Vs DeltaTemp
         //  deltaTemp = (-0.0029 * Qd) + 3.47
         deltaTemp = ( LINEAR_SLOPE_FACTOR * dialFlowrate ) + LINEAR_INTERCEPT_FACTOR;
     }
Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -r34e1ca4e998f57d2e962709cd272a296dc4d8c50 -r4859dab16682b54caf2eac157443fc6e60f0cd70
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 34e1ca4e998f57d2e962709cd272a296dc4d8c50)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 4859dab16682b54caf2eac157443fc6e60f0cd70)
@@ -64,7 +64,7 @@
 void updateTreatmentSettings( void );                       // Process the recent treatment parameters changes
 BOOL requestDDGenDialyasteStop( void );                     // Stop generate dialysate
 U32 getD48PumpSpeedForBCFill( void );                       // Get D48 pump speed
-void setD48PumpSpeedFill( U32 pumpSpeed );                  // Set D48 pump speed
+void setD48PumpSpeedForBCFill( U32 pumpSpeed );             // Set D48 pump speed
 
 BOOL testDDGenDialysateDataPublishIntervalOverride( MESSAGE_T *message );   // GenD Mode data publish interval override
 BOOL testDialDeliveryInProgressOverride( MESSAGE_T *message );              // To override the dialysate delivery in progress flag