diff --git a/Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp b/Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp
index 864daa3b..b7a130a9 100644
--- a/Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp
+++ b/Devices/m5stack-cardputer-adv/Source/devices/SdCard.cpp
@@ -3,7 +3,6 @@
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
 constexpr auto SDCARD_PIN_CS = GPIO_NUM_12;
-constexpr auto LCD_PIN_CS = GPIO_NUM_37;
 
 using tt::hal::sdcard::SpiSdCardDevice;
 
@@ -15,7 +14,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::hal::spi::getLock(SPI3_HOST),
-        std::vector { LCD_PIN_CS },
+        std::vector<gpio_num_t>(),
         SPI3_HOST
     );
 
diff --git a/Devices/m5stack-cardputer/Source/devices/SdCard.cpp b/Devices/m5stack-cardputer/Source/devices/SdCard.cpp
index 864daa3b..b7a130a9 100644
--- a/Devices/m5stack-cardputer/Source/devices/SdCard.cpp
+++ b/Devices/m5stack-cardputer/Source/devices/SdCard.cpp
@@ -3,7 +3,6 @@
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
 constexpr auto SDCARD_PIN_CS = GPIO_NUM_12;
-constexpr auto LCD_PIN_CS = GPIO_NUM_37;
 
 using tt::hal::sdcard::SpiSdCardDevice;
 
@@ -15,7 +14,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::hal::spi::getLock(SPI3_HOST),
-        std::vector { LCD_PIN_CS },
+        std::vector<gpio_num_t>(),
         SPI3_HOST
     );
 
diff --git a/Tactility/Source/service/wifi/WifiMock.cpp b/Tactility/Source/service/wifi/WifiMock.cpp
index 716b2ba8..5a5ff44e 100644
--- a/Tactility/Source/service/wifi/WifiMock.cpp
+++ b/Tactility/Source/service/wifi/WifiMock.cpp
@@ -1,3 +1,7 @@
+#ifdef ESP_PLATFORM
+#include <sdkconfig.h>
+#endif
+
 #ifndef CONFIG_ESP_WIFI_ENABLED
 
 #include <Tactility/service/wifi/Wifi.h>
diff --git a/Tactility/Source/settings/DisplaySettings.cpp b/Tactility/Source/settings/DisplaySettings.cpp
index 33a1e9fc..6290530f 100644
--- a/Tactility/Source/settings/DisplaySettings.cpp
+++ b/Tactility/Source/settings/DisplaySettings.cpp
@@ -92,7 +92,7 @@ bool load(DisplaySettings& settings) {
         }
     }
 
-    bool timeout_enabled = true;
+    bool timeout_enabled = false;
     auto timeout_enabled_entry = map.find(SETTINGS_KEY_TIMEOUT_ENABLED);
     if (timeout_enabled_entry != map.end()) {
         timeout_enabled = (timeout_enabled_entry->second == "1" || timeout_enabled_entry->second == "true" || timeout_enabled_entry->second == "True");
@@ -118,7 +118,7 @@ DisplaySettings getDefault() {
         .orientation = getDefaultOrientation(),
         .gammaCurve = 1,
         .backlightDuty = 200,
-        .backlightTimeoutEnabled = true,
+        .backlightTimeoutEnabled = false,
         .backlightTimeoutMs = 60000
     };
 }
diff --git a/device.py b/device.py
index 18465a37..7c207e4f 100644
--- a/device.py
+++ b/device.py
@@ -111,10 +111,14 @@ def write_core_variables(output_file, device_properties: ConfigParser):
     output_file.write("# Target\n")
     output_file.write(f"CONFIG_IDF_TARGET=\"{idf_target}\"\n")
     output_file.write("# CPU\n")
-    output_file.write(f"CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y\n")
-    output_file.write(f"CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240\n")
+    output_file.write("CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y\n")
+    output_file.write("CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240\n")
     output_file.write(f"CONFIG_{idf_target.upper()}_DEFAULT_CPU_FREQ_240=y\n")
     output_file.write(f"CONFIG_{idf_target.upper()}_DEFAULT_CPU_FREQ_MHZ=240\n")
+    if idf_target != "esp32": # Not available on original ESP32
+        output_file.write("# Enable usage of MALLOC_CAP_EXEC on IRAM:\n")
+        output_file.write("CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n\n")
+        output_file.write("CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=n\n")
 
 def write_flash_variables(output_file, device_properties: ConfigParser):
     flash_size = get_property_or_exit(device_properties, "hardware", "flashSize")