Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r236e5a9331b60710d1eb45ed3c70e90885fe24f6 -r65d64e90e7e32c1914708d0ff3df18a96e012af2
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 236e5a9331b60710d1eb45ed3c70e90885fe24f6)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 65d64e90e7e32c1914708d0ff3df18a96e012af2)
@@ -804,7 +804,7 @@
         if (QdTarget < DIAL_IN_FLOW_QHIGHTRANSITION && QdTarget >= DIAL_IN_FLOW_QLOWTRANSITION)
         {   // use blended flow rate calculation
             estimatedFlow = ( (QdTarget - DIAL_IN_FLOW_QLOWTRANSITION)/(DIAL_IN_FLOW_QHIGHTRANSITION-DIAL_IN_FLOW_QLOWTRANSITION) ) * calculatedFlow +
-                    ( (DIAL_IN_FLOW_QHIGHTRANSITION - QdTarget)/(DIAL_IN_FLOW_QHIGHTRANSITION-DIAL_IN_FLOW_QLOWTRANSITION) ) * filteredDialInFlowMeterReading;
+                            ( (DIAL_IN_FLOW_QHIGHTRANSITION - QdTarget)/(DIAL_IN_FLOW_QHIGHTRANSITION-DIAL_IN_FLOW_QLOWTRANSITION) ) * filteredDialInFlowMeterReading;
         }
         else
         {   // use calculated flow rate. Assume target flow rate has already checked for out of bounds on low end.
@@ -846,7 +846,7 @@
 void resetDialInPumpRotorCount( void )
 {
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) == SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) )
     {
         dialysateInPumpRotorCounter.data = DIAL_IN_MAX_ROTOR_COUNT_FOR_WEAR;
     }