Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r771a741a1698770e6997c6657bd520fb557d0f2d -r93774c1a907fb9ce8e5c784e77ed3483c04a525b
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 771a741a1698770e6997c6657bd520fb557d0f2d)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 93774c1a907fb9ce8e5c784e77ed3483c04a525b)
@@ -57,7 +57,7 @@
 static U32 balChamberValveClosePeriod;                                                          ///< Close balancing chamber valves with the defined time prior switching state.
 static U32 currentBalChamberSwitchingCounter;                                                   ///< Counter (in task interval) to monitor the timing spent during balancing chamber fill/drain operation.
 static BOOL isBalChamberFillInProgress;                                                         ///< Flag indicating balancing chamber fill/drain is in progress.
-static BOOL isPressureStalbilizedDuringFill;                                                    ///< Flag indicating that the pressure is stablized due to fill complete.
+static BOOL isPressureStabilizedDuringFill;                                                     ///< Flag indicating that the pressure is stabilized due to fill complete.
 static BAL_CHAMBER_SW_STATE_T balChamberSWState;                                                ///< Current balancing chamber switching state ( state 1 or state 2).
 static U32 balChamberDataPublicationTimerCounter;                                               ///< Used to schedule balancing chamber data publication to CAN bus.
 static U32 balChamberFillPressureDropCounter;                                                   ///< Counter to check balancing chamber valves opened and there by pressure drop is seen.
@@ -116,7 +116,7 @@
     balChamberValveClosePeriod                  = 0;
     isBalChamberFillInProgress                  = FALSE;
     currentBalChamberSwitchingCounter           = 0;
-    isPressureStalbilizedDuringFill             = FALSE;
+    isPressureStabilizedDuringFill              = FALSE;
     lastTdDialysateFlowrate                     = 0.0F;
     balChamberDataPublicationTimerCounter       = 0;
     balChamberFillPressureDropCounter           = 0;
@@ -407,7 +407,7 @@
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE1_FILL_START;
     currentBalChamberSwitchingCounter   = 0;
     isBalChamberFillInProgress          = FALSE;
-    isPressureStalbilizedDuringFill     = FALSE;
+    isPressureStabilizedDuringFill      = FALSE;
     isPressureDroppedDuringFill         = FALSE;
     balChamberSWState                   = BAL_CHAMBER_SW_STATE1;
 
@@ -509,7 +509,7 @@
  * The handleBalChamberState1ValvesClose function check for the balancing chamber
  * fill complete and close the currently opened valves.
  * @details \b Inputs: currentBalChamberSwitchingCounter, spent and fresh dialysate pressure
- * @details \b Outputs: isPressureStalbilizedDuringFill,isBalChamberFillInProgress
+ * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1ValvesClose( void )
@@ -526,13 +526,13 @@
         if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
             // stabilized pressure indicating fill is complete
-            isPressureStalbilizedDuringFill = TRUE;
+            isPressureStabilizedDuringFill = TRUE;
         }
     }
 
     // Switching time met or pressure in range, close valves
     if ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) ||
-         ( TRUE == isPressureStalbilizedDuringFill ) )
+         ( TRUE == isPressureStabilizedDuringFill ) )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
@@ -576,7 +576,7 @@
                     // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
                 }
-                else if ( TRUE != isPressureStalbilizedDuringFill )
+                else if ( TRUE != isPressureStabilizedDuringFill )
                 {
                     // Alarm when switching time expired, but still pressure not in range which indicates fill is not yet completed.
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -617,7 +617,7 @@
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE2_FILL_START;
     currentBalChamberSwitchingCounter   = 0;
     isBalChamberFillInProgress          = FALSE;
-    isPressureStalbilizedDuringFill     = FALSE;
+    isPressureStabilizedDuringFill      = FALSE;
     isPressureDroppedDuringFill         = FALSE;
     balChamberSWState                   = BAL_CHAMBER_SW_STATE2;
 
@@ -668,7 +668,7 @@
  * The handleBalChamberState2ValvesClose function check for the balancing chamber
  * fill complete and close the currently opened valves.
  * @details \b Inputs: currentBalChamberSwitchingCounter, spent and fresh dialysate pressure
- * @details \b Outputs: isPressureStalbilizedDuringFill,isBalChamberFillInProgress
+ * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress
  * @return next balancing chamber state.
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void )
@@ -685,13 +685,13 @@
         if ( ++balChamberFillCompleteStablePressureCounter >= BAL_CHAMBER_FILL_COMPLETE_MS )
         {
             // stabilized pressure indicating fill is complete
-            isPressureStalbilizedDuringFill = TRUE;
+            isPressureStabilizedDuringFill = TRUE;
         }
     }
 
     // Check switching cycle time or pressure check for valve closure
     if ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) ||
-         ( TRUE == isPressureStalbilizedDuringFill ) )
+         ( TRUE == isPressureStabilizedDuringFill ) )
     {
         // close the valves
         valveControlForBCState2FillEnd();
@@ -709,7 +709,7 @@
  * The handleBalChamberState2FillEnd function check for the balancing chamber
  * switching period complete and transition to next state.
  * @details \b Inputs: currentBalChamberSwitchingCounter, balChamberSwitchingPeriod
- * @details \b Outputs: isPressureStalbilizedDuringFill,isBalChamberFillInProgress
+ * @details \b Outputs: isPressureStabilizedDuringFill,isBalChamberFillInProgress
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE
  * when pressure is not in range during balacing chamber state 2 fill in progress.
  * @details \b Alarm: ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE
@@ -736,7 +736,7 @@
                     // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
                 }
-                else if ( TRUE != isPressureStalbilizedDuringFill )
+                else if ( TRUE != isPressureStabilizedDuringFill )
                 {
                     // Alarm when switching time expired, but still pressure not in range which indicates fill is not completed.
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
@@ -896,7 +896,7 @@
         data.balChamberSwPeriod                 = balChamberSwitchingPeriod;
         data.isBalChamberFillInProgress         = isBalChamberFillInProgress;
         data.currentBalChamberSwitchingCounter  = currentBalChamberSwitchingCounter;
-        data.isPressureStalbilizedDuringFill    = isPressureStalbilizedDuringFill;
+        data.isPressureStabilizedDuringFill     = isPressureStabilizedDuringFill;
         data.balChamberSWOnlyState              = balanceChamberSwitchingOnly;
 
         broadcastData( MSG_ID_DD_BAL_CHAMBER_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( BAL_CHAMBER_DATA_T ) );
Index: firmware/App/Controllers/BalancingChamber.h
===================================================================
diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r93774c1a907fb9ce8e5c784e77ed3483c04a525b
--- firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 830213bc6dcc1a684610caf78c79d55f2cb41e93)
+++ firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 93774c1a907fb9ce8e5c784e77ed3483c04a525b)
@@ -48,7 +48,7 @@
     U32 balChamberSwPeriod;                                             ///< Balancing chamber switching period
     BOOL isBalChamberFillInProgress;                                    ///< Whether balancing chamber fill in progress or not
     U32 currentBalChamberSwitchingCounter;                              ///< Current balancing chamber switching counter
-    BOOL isPressureStalbilizedDuringFill;                               ///< Whether pressure stabilized during fill or not
+    BOOL isPressureStabilizedDuringFill;                                ///< Whether pressure stabilized during fill or not
     BOOL balChamberSWOnlyState;                                         ///< Balancing chamber switching only status ( On/Off)
 } BAL_CHAMBER_DATA_T;
 
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r771a741a1698770e6997c6657bd520fb557d0f2d -r93774c1a907fb9ce8e5c784e77ed3483c04a525b
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 771a741a1698770e6997c6657bd520fb557d0f2d)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 93774c1a907fb9ce8e5c784e77ed3483c04a525b)
@@ -581,18 +581,7 @@
          * If speed < 0.0 set to 0
          * else speed > 60 set to 60
          */
-        if ( ( CONCENTRATE_PUMP_MIN_SPEED <= targetSpeed_ml_min ) && ( targetSpeed_ml_min <= CONCENTRATE_PUMP_MAX_SPEED ) )
-        {
-            pumpTargetSpeed[ pumpId ].data = targetSpeed_ml_min;
-        }
-        else if ( targetSpeed_ml_min < CONCENTRATE_PUMP_MIN_SPEED )
-        {
-            pumpTargetSpeed[ pumpId ].data = 0.0;
-        }
-        else
-        {
-            pumpTargetSpeed[ pumpId ].data = CONCENTRATE_PUMP_MAX_SPEED;
-        }
+        pumpTargetSpeed[ pumpId ].data = RANGE(targetSpeed_ml_min, CONCENTRATE_PUMP_MIN_SPEED, CONCENTRATE_PUMP_MAX_SPEED );
     }
     else
     {