Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3a371ac06b79d024d7fe1607f003031eb9322ba4 -r6d515660f021d0a6b2a394601e69958334302aff
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3a371ac06b79d024d7fe1607f003031eb9322ba4)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 6d515660f021d0a6b2a394601e69958334302aff)
@@ -180,6 +180,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -190,6 +191,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -223,6 +225,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r06eb22ab71c1fcec86377c43d131899aa37af508 -r6d515660f021d0a6b2a394601e69958334302aff
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 06eb22ab71c1fcec86377c43d131899aa37af508)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 6d515660f021d0a6b2a394601e69958334302aff)
@@ -93,11 +93,11 @@
         switch ( i )
         {
             case CONCENTRATE_CAP:
-                currentSwitchStatus = ( getFPGAConcentrateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = getFPGAConcentrateCapStatus();
                 break;
 
             case DIALYSATE_CAP:
-                currentSwitchStatus = ( getFPGADialysateCapStatus() != 0 ? STATE_OPEN : STATE_CLOSED );
+                currentSwitchStatus = getFPGADialysateCapStatus();
                 break;
 
 #ifndef _VECTORCAST_