Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf43eb0d0f168ea14b846d0c24f0ad0cb30784d3f -r2e71ad5c3af03ed6767a80c4e9d1ee25e4baf817
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f43eb0d0f168ea14b846d0c24f0ad0cb30784d3f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2e71ad5c3af03ed6767a80c4e9d1ee25e4baf817)
@@ -183,6 +183,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -193,6 +194,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -226,13 +228,16 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged )
         {
             status                                    = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
         }
+#endif
     }
     else
     {
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rf43eb0d0f168ea14b846d0c24f0ad0cb30784d3f -r2e71ad5c3af03ed6767a80c4e9d1ee25e4baf817
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision f43eb0d0f168ea14b846d0c24f0ad0cb30784d3f)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 2e71ad5c3af03ed6767a80c4e9d1ee25e4baf817)
@@ -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;
 
             // NOTE: the default case was removed since this switch case is executed using a for loop so the default