diff --git a/Software/src/webui.cpp b/Software/src/webui.cpp
index 5111f44..ce01e5f 100644
--- a/Software/src/webui.cpp
+++ b/Software/src/webui.cpp
@@ -98,20 +98,24 @@ String processor(const String &var)
   }
   if (var == "SHOW_IMPULSE_SETTINGS")
     return LubeConfig.SpeedSource == SOURCE_IMPULSE ? "" : "hidden";
-#ifdef FEATURE_ENABLE_CAN
   if (var == "SHOW_CAN_SETTINGS")
+#ifdef FEATURE_ENABLE_CAN
     return LubeConfig.SpeedSource == SOURCE_CAN ? "" : "hidden";
+#else
+    return "hidden";
 #endif
-#ifdef FEATURE_ENABLE_GPS
   if (var == "SHOW_GPS_SETTINGS")
+#ifdef FEATURE_ENABLE_GPS
     return LubeConfig.SpeedSource == SOURCE_GPS ? "" : "hidden";
+#else
+    return "hidden";
 #endif
   if (var == "SHOW_DTC_TABLE")
     return globals.systemStatus == sysStat_Error ? "" : "hidden";
 
   if (var == "DTC_TABLE")
   {
-    String temp;
+    String temp = "";
     char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
 
     for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
@@ -125,7 +129,7 @@ String processor(const String &var)
                 DTCStorage[i].timestamp / 1000 % 60,   // Seconds
                 DTCStorage[i].timestamp % 1000);       // milliseconds
 
-        temp = "<tr><td>" + String(buff_timestamp);
+        temp = temp + "<tr><td>" + String(buff_timestamp);
         temp = temp + "</td><td>" + String(DTCStorage[i].Number) + "</td><td>";
 
         if (DTCStorage[i].active == DTC_ACTIVE)