diff --git a/app/Kconfig b/app/Kconfig
index 2b5852cf7..2278d3f4d 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -691,10 +691,10 @@ config ZMK_KEYMAP_SENSORS_DEFAULT_TRIGGERS_PER_ROTATION
 
 endif # ZMK_KEYMAP_SENSORS
 
-DT_COMPAT_ZMK_BOOT_MAGIC_KEY := zmk,boot-magic-key
 config ZMK_BOOT_MAGIC_KEY
     bool "Enable actions when keys are held at boot"
-    default $(dt_compat_enabled,$(DT_COMPAT_ZMK_BOOT_MAGIC_KEY))
+    default y
+    depends on DT_HAS_ZMK_BOOT_MAGIC_KEY_ENABLED
 
 config ZMK_BOOT_MAGIC_KEY_TIMEOUT_MS
     int "Milliseconds to wait for a boot magic key at startup"
diff --git a/app/dts/bindings/zmk,boot-magic-key.yaml b/app/dts/bindings/zmk,boot-magic-key.yaml
index 3629c0e8a..89a24c99a 100644
--- a/app/dts/bindings/zmk,boot-magic-key.yaml
+++ b/app/dts/bindings/zmk,boot-magic-key.yaml
@@ -5,7 +5,7 @@ description: |
   Triggers one or more actions if a specific key is held while the keyboard boots.
   This is typically used for recovering a keyboard in cases such as &bootloader
   being missing from the keymap or a split peripheral which isn't connected to
-  the central, and therefore can't process th ekeymap.
+  the central, and therefore can't process the keymap.
 
 compatible: "zmk,boot-magic-key"
 
diff --git a/app/src/ble.c b/app/src/ble.c
index ea25d58eb..b94717e3a 100644
--- a/app/src/ble.c
+++ b/app/src/ble.c
@@ -39,7 +39,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #if IS_ENABLED(CONFIG_ZMK_BLE_PASSKEY_ENTRY)
 #include <zmk/events/keycode_state_changed.h>
-#include "ble.h"
 
 #define PASSKEY_DIGITS 6
 
diff --git a/app/src/boot_magic_key.c b/app/src/boot_magic_key.c
index a4b430f4d..d20843b48 100644
--- a/app/src/boot_magic_key.c
+++ b/app/src/boot_magic_key.c
@@ -26,7 +26,7 @@
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 struct boot_key_config {
-    int key_position;
+    uint16_t key_position;
     bool jump_to_bootloader;
     bool reset_settings;
 };