diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 15e437bb5..c6d90970f 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -117,8 +117,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WIRELESS_PAPER
 #elif defined(TLORA_T3S3_V1)
 #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3
-#elif defined(CDEBYTE_ELORA_S3)
-#define HW_VENDOR meshtastic_HardwareModel_CDEBYTE_ELORA_S3
+#elif defined(CDEBYTE_EORA_S3)
+#define HW_VENDOR meshtastic_HardwareModel_CDEBYTE_EORA_S3
 #elif defined(BETAFPV_2400_TX)
 #define HW_VENDOR meshtastic_HardwareModel_BETAFPV_2400_TX
 #elif defined(NANO_G1_EXPLORER)
diff --git a/src/sleep.cpp b/src/sleep.cpp
index a2a221d79..e58c3872a 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -157,6 +157,10 @@ void initDeepSleep()
         for (uint8_t i = 0; i <= GPIO_NUM_MAX; i++) {
             if (rtc_gpio_is_valid_gpio((gpio_num_t)i))
                 rtc_gpio_hold_dis((gpio_num_t)i);
+
+            // ESP32 (original)
+            else if (GPIO_IS_VALID_OUTPUT_GPIO((gpio_num_t)i))
+                gpio_hold_dis((gpio_num_t)i);
         }
     }
 #endif
@@ -209,7 +213,8 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
 
 #ifdef ARCH_ESP32
     // Full shutdown of bluetooth hardware
-    nimbleBluetooth->deinit();
+    if (nimbleBluetooth)
+        nimbleBluetooth->deinit();
 #endif
 
 #ifdef ARCH_ESP32
@@ -258,14 +263,17 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false)
     }
 #ifdef BUTTON_PIN
     // Avoid leakage through button pin
-    pinMode(BUTTON_PIN, INPUT);
-    gpio_hold_en((gpio_num_t)BUTTON_PIN);
+    if (GPIO_IS_VALID_OUTPUT_GPIO(BUTTON_PIN)) {
+        pinMode(BUTTON_PIN, INPUT);
+        gpio_hold_en((gpio_num_t)BUTTON_PIN);
+    }
 #endif
-
-    // LoRa CS (RADIO_NSS) needs to stay HIGH, even during deep sleep
-    pinMode(LORA_CS, OUTPUT);
-    digitalWrite(LORA_CS, HIGH);
-    gpio_hold_en((gpio_num_t)LORA_CS);
+    if (GPIO_IS_VALID_OUTPUT_GPIO(LORA_CS)) {
+        // LoRa CS (RADIO_NSS) needs to stay HIGH, even during deep sleep
+        pinMode(LORA_CS, OUTPUT);
+        digitalWrite(LORA_CS, HIGH);
+        gpio_hold_en((gpio_num_t)LORA_CS);
+    }
 #endif
 
 #ifdef HAS_PMU