Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r0fdb539277f865425aba65d98e8e9147484a99e0 -r5b4cead5cae17e59fb9d3a004a989a70c2fa916d
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0fdb539277f865425aba65d98e8e9147484a99e0)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 5b4cead5cae17e59fb9d3a004a989a70c2fa916d)
@@ -19,7 +19,7 @@
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
-#include "DryBiCart.h" // For request setBicarbChamberFillRequested
+#include "DryBiCart.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "ModeGenDialysate.h"
@@ -889,8 +889,8 @@
  *************************************************************************/
 static BOOL isSpentFillCompleteByPressure( F32 spentDialPressure, F32 qdMlpm, F32 spentFillCompletePresPsig )
 {
-    BOOL useSlopeDetector = ( ( TRUE != getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP ) ) &&
-                              ( qdMlpm <= SPENT_FILL_COMPLETE_QD_SLOPE_MAX_MLPM ) );
+    BOOL useSlopeDetector = ( ( ( TRUE != getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP ) ) &&
+                                ( qdMlpm <= SPENT_FILL_COMPLETE_QD_SLOPE_MAX_MLPM ) ) ? TRUE : FALSE );
     BOOL state;
 
     if ( TRUE == useSlopeDetector )
@@ -899,9 +899,9 @@
         U32 maxDetectCount            = balChamberValveClosePeriod + detectTolCount;
         U32 minDetectCount            = balChamberValveClosePeriod - detectTolCount;
         BOOL isDetectionInCountWindow = ( ( currentBalChamberFillCounter >= minDetectCount ) &&
-                                            ( currentBalChamberFillCounter <= maxDetectCount ) );
+                                          ( currentBalChamberFillCounter <= maxDetectCount ) ) ? TRUE : FALSE;
         F32 riseDeltaPsi              = spentDialPressure - lastPrevSpentDialPressure;
-        BOOL riseHit                  = ( riseDeltaPsi > SPENT_FILL_COMPLETE_DP_RISE_PSIG );
+        BOOL riseHit                  = ( riseDeltaPsi > SPENT_FILL_COMPLETE_DP_RISE_PSIG ) ? TRUE : FALSE;
         U32 requiredRiseCount;
 
         if ( riseDeltaPsi > SPENT_FILL_SLOPE_SPENT_PRESSURE_HIGH_PSIG )
@@ -941,11 +941,11 @@
 
         state = ( ( spentFillRiseHitCount >= requiredRiseCount ) ||
                  ( ( currentBalChamberFillCounter >= balChamberValveClosePeriod ) &&
-                   ( spentDialPressure >= spentFillCompletePresPsig ) ) );
+                   ( spentDialPressure >= spentFillCompletePresPsig ) ) ) ? TRUE : FALSE;
     }
     else
     {
-        state = ( spentDialPressure >= spentFillCompletePresPsig );
+        state = ( spentDialPressure >= spentFillCompletePresPsig ) ? TRUE : FALSE;
 
     }
     return state;