Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rda8a230122d868cadb2513ac418017ade0dfddf5 -rd94ff9da27cd8765194e574d4c03b50b5da3b855
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision da8a230122d868cadb2513ac418017ade0dfddf5)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision d94ff9da27cd8765194e574d4c03b50b5da3b855)
@@ -867,7 +867,7 @@
     {
         case MODE_TREA:
         case MODE_SERV:
-            if ( FALSE == isDialysateLineInBypass() )
+            if ( ( FALSE == isDialysateLineInBypass() ) && ( getTreatmentState() != TREATMENT_RECIRC_STATE ) )
             {
                 if ( BLOOD_LEAK_DETECTED == getBloodLeakStatus() )
                 {
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rda8a230122d868cadb2513ac418017ade0dfddf5 -rd94ff9da27cd8765194e574d4c03b50b5da3b855
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision da8a230122d868cadb2513ac418017ade0dfddf5)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d94ff9da27cd8765194e574d4c03b50b5da3b855)
@@ -1596,8 +1596,8 @@
 
     if ( FALSE == isRequestFromTreatmentStop )
     {
-        // The pressure window is widened to prevent pressure alarm in bypassing the dialysate.
-        // The spike occurs due to flipping VDi valve would result in all of the blood flow going through
+        // The pressure window is widened to prevent pressure alarm in bypassing the dialyzer.
+        // The spike occurs due to bypassing VDi valve would result in all of the blood flow going through
         // the dialyzer and pressure cannot go across the dialyzer.
         signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
     }
Index: firmware/App/Modes/ModePostTreat.h
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -rd94ff9da27cd8765194e574d4c03b50b5da3b855
--- firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Modes/ModePostTreat.h	(.../ModePostTreat.h)	(revision d94ff9da27cd8765194e574d4c03b50b5da3b855)
@@ -42,8 +42,8 @@
 
     U32 acidConcentrate;                        ///< Acid concentrate option
     U32 bicarbConcentrate;                      ///< Bicarbonate concentrate option
-    U32 potassiumConcentration;                 ///< Potassium concentration value in mEq/L.
-    U32 calciumConcentration;                   ///< Calcium concentration value in mEq/L.
+    F32 potassiumConcentration;                 ///< Potassium concentration value in mEq/L.
+    F32 calciumConcentration;                   ///< Calcium concentration value in mEq/L.
     U32 bicarbonateConcentration;               ///< Bicarbonate concentration value in mEq/L.
     U32 sodiumConcentration;                    ///< Sodium concentration value in mEq/L.