Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r0e084183dc794092c52734b916fcd79dc16829ad -rc5d9d64a1628c5508386fb89c99fde80b02ac79a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0e084183dc794092c52734b916fcd79dc16829ad)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision c5d9d64a1628c5508386fb89c99fde80b02ac79a)
@@ -606,7 +606,7 @@
 
         measuredTempAtDialyzer = getFilteredTemperatureValue( D1_TEMP );
 #else
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+        if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
         {
             measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND );
         }
@@ -704,7 +704,7 @@
             // Use new RTD sensor placed closed to dialyzer, connected to D1 port
             measuredTempAtDialyzer = getFilteredTemperatureValue( D1_TEMP );
 #else
-            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
+            if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
             {
                 measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND );
             }
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rf90c1eef73251d75ce49645eb05deb492a486ff0 -rc5d9d64a1628c5508386fb89c99fde80b02ac79a
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f90c1eef73251d75ce49645eb05deb492a486ff0)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c5d9d64a1628c5508386fb89c99fde80b02ac79a)
@@ -59,8 +59,8 @@
 #include "StateFlushFilterDefeatured.h"
 #include "StateFlushPermeate.h"
 #include "StateInletPressureCheck.h"
-#include "SystemCommDD.h"
 #include "SubstitutionPump.h"
+#include "SystemCommDD.h"
 #include "Temperature.h"
 #include "TestSupport.h"
 #include "TDInterface.h"