diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
index 2838e8f..8cc60b6 100644
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@@ -119,7 +119,7 @@ void setup() {
     WiFi.mode(WIFI_OFF);
     logger.log(logging::LoggerLevel::LOGGER_LEVEL_DEBUG, "Main", "WiFi controller stopped");
 
-    if (Config.bluetoothType == 0 || Config.bluetoothType == 3) {
+    if (Config.bluetoothType == 0 || Config.bluetoothType == 2) {
         BLE_Utils::setup();
     } else {
         #ifdef HAS_BT_CLASSIC
diff --git a/src/bluetooth_utils.cpp b/src/bluetooth_utils.cpp
index 4e24703..000ac1b 100644
--- a/src/bluetooth_utils.cpp
+++ b/src/bluetooth_utils.cpp
@@ -14,7 +14,7 @@ extern logging::Logger  logger;
 extern TinyGPSPlus      gps;
 extern bool             bluetoothConnected;
 
-bool bluetoothActive    = Config.bluetoothActive;
+bool bluetoothActive;
 
 namespace BLUETOOTH_Utils {
     String serialReceived;
@@ -22,6 +22,7 @@ namespace BLUETOOTH_Utils {
     bool useKiss = false;
 
     void setup() {
+        bluetoothActive = Config.bluetoothActive;
         if (!bluetoothActive) {
             btStop();
             esp_bt_controller_disable();
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 8faf671..1a49a8c 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -16,7 +16,7 @@ Configuration::Configuration() {
 }
 
 void Configuration::readFile(fs::FS &fs, const char *fileName) {
-    StaticJsonDocument<2560> data;
+    StaticJsonDocument<2800> data;
     File configFile = fs.open(fileName, "r");
     DeserializationError error = deserializeJson(data, configFile);
     if (error) {
diff --git a/src/menu_utils.cpp b/src/menu_utils.cpp
index a5e3ff2..8e56f55 100644
--- a/src/menu_utils.cpp
+++ b/src/menu_utils.cpp
@@ -43,7 +43,6 @@ extern String               winlinkAlias;
 extern String               winlinkAliasComplete;
 extern bool                 winlinkCommentState;
 extern int                  wxModuleType;
-//extern bool                 bmeSensorFound;
 
 String      freqChangeWarning;
 uint8_t     lowBatteryPercent       = 21;