Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r16c0f816fadfa45b51467c5292ba9ecf7a3914bd -r4d7bb5dc92d934b7237391503b211f238ba0d254
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 16c0f816fadfa45b51467c5292ba9ecf7a3914bd)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 4d7bb5dc92d934b7237391503b211f238ba0d254)
@@ -479,6 +479,11 @@
             targetSpeed_ml_min                   *= -1.0;
         }
 
+        /*
+         * If 3 <= speed <= 48 set it
+         * If speed < 3 set to 0
+         * else speed > 48 set to 48
+         */
         if ( ( CONCENTRATE_PUMP_MIN_SPEED <= targetSpeed_ml_min ) && ( targetSpeed_ml_min <= CONCENTRATE_PUMP_MAX_SPEED ) )
         {
             concentratePumps[ pumpId ].pumpTargetSpeed = targetSpeed_ml_min;
@@ -487,7 +492,7 @@
         {
             concentratePumps[ pumpId ].pumpTargetSpeed = 0.0;
         }
-        else if ( targetSpeed_ml_min > CONCENTRATE_PUMP_MAX_SPEED )
+        else
         {
             concentratePumps[ pumpId ].pumpTargetSpeed = CONCENTRATE_PUMP_MAX_SPEED;
         }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r8c22edb621da0832b1e1d9c7b1600dd63c94877d -r4d7bb5dc92d934b7237391503b211f238ba0d254
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 8c22edb621da0832b1e1d9c7b1600dd63c94877d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 4d7bb5dc92d934b7237391503b211f238ba0d254)
@@ -1091,7 +1091,7 @@
 
         case DG_FILL_MODE_STATE_DELIVER_DIALYSATE:
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
-            if ( ( didFillRecoverFromPause != TRUE ) || ( 0 == dialysateFillStartTimeMS )  )
+            if ( ( didFillRecoverFromPause != TRUE ) || ( 0 == dialysateFillStartTimeMS ) )
             {
                 dialysateFillStartTimeMS = getMSTimerCount();
             }