diff --git a/platformio.ini b/platformio.ini
index 3d18c5a..4e9c1a5 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -21,18 +21,13 @@ board_upload.flash_size = 16MB
 board_build.partitions = default_16MB.csv
 board_build.arduino.memory_type = qio_opi
 
-; Build flags: Enable TinyUSB OTG, NimBLE, Audio/HID composite descriptors
+; Enable Native USB OTG TinyUSB Stack
 build_flags =
     -DBOARD_HAS_PSRAM
     -mfix-esp32-psram-cache-issue
+    -DARDUINO_USB_CDC_ON_BOOT=1
     -DARDUINO_USB_MODE=0
-    -DARDUINO_USB_CDC_ON_BOOT=0
     -DCORE_DEBUG_LEVEL=3
-    -DCFG_TUSB_MCU=OPT_MCU_ESP32S3
-    -DCFG_TUD_ENABLED=1
-    -DCFG_TUD_AUDIO=1
-    -DCFG_TUD_HID=2
-    -DCFG_TUD_CDC=1
     -I include
 
 lib_deps =
diff --git a/src/ble/ble_remote_client.cpp b/src/ble/ble_remote_client.cpp
index 8d3938c..d58b4cc 100644
--- a/src/ble/ble_remote_client.cpp
+++ b/src/ble/ble_remote_client.cpp
@@ -5,17 +5,17 @@
 #include <Arduino.h>
 #include <NimBLEDevice.h>
 
-static ble_remote_state_t  s_ble_state = BLE_STATE_DISCONNECTED;
-static NimBLEClient*       s_client = nullptr;
-static NimBLERemoteChar*   s_char_cmd = nullptr;
-static NimBLERemoteChar*   s_char_aud = nullptr;
-static NimBLERemoteChar*   s_char_ctl = nullptr;
+static ble_remote_state_t              s_ble_state = BLE_STATE_DISCONNECTED;
+static NimBLEClient*                   s_client = nullptr;
+static NimBLERemoteCharacteristic*     s_char_cmd = nullptr;
+static NimBLERemoteCharacteristic*     s_char_aud = nullptr;
+static NimBLERemoteCharacteristic*     s_char_ctl = nullptr;
 
-static uint8_t             s_session_id = 0;
-static uint32_t            s_last_audio_ms = 0;
-static uint32_t            s_last_extend_ms = 0;
-static uint32_t            s_last_scan_ms = 0;
-static size_t              s_frame_size = AUDIO_DEFAULT_FRAME_BYTES;
+static uint8_t                         s_session_id = 0;
+static uint32_t                        s_last_audio_ms = 0;
+static uint32_t                        s_last_extend_ms = 0;
+static uint32_t                        s_last_scan_ms = 0;
+static size_t                          s_frame_size = AUDIO_DEFAULT_FRAME_BYTES;
 
 extern key_mapper_engine_t g_key_engine;
 
@@ -67,7 +67,7 @@ static void on_ctl_notify(NimBLERemoteCharacteristic* pChar, uint8_t* pData, siz
         uint16_t ver = (pData[1] << 8) | pData[2];
         uint16_t fs = (pData[5] << 8) | pData[6];
         if (fs > 0) s_frame_size = fs;
-        Serial.printf("[ATVV] CAPS: ver=0x%04X, frame_size=%d\n", ver, s_frame_size);
+        Serial.printf("[ATVV] CAPS: ver=0x%04X, frame_size=%d\n", ver, (int)s_frame_size);
     }
     // AUDIO_SYNC: op == 0x0A
     else if (op == 0x0A && length >= 7) {
diff --git a/src/usb/usb_composite.cpp b/src/usb/usb_composite.cpp
index d8bddb2..aebd02b 100644
--- a/src/usb/usb_composite.cpp
+++ b/src/usb/usb_composite.cpp
@@ -29,11 +29,11 @@ void usb_composite_task(void) {
 
 bool usb_hid_keyboard_press(uint8_t modifier, uint8_t keycode) {
     if (!s_usb_ready) return false;
-    // Map modifier & keycode
     KeyReport report = {0};
     report.modifiers = modifier;
     report.keys[0] = keycode;
-    return s_keyboard.sendReport(&report);
+    s_keyboard.sendReport(&report);
+    return true;
 }
 
 bool usb_hid_keyboard_release(void) {
@@ -52,7 +52,8 @@ bool usb_hid_keyboard_tap(uint8_t modifier, uint8_t keycode) {
 
 bool usb_hid_consumer_press(uint16_t usage_code) {
     if (!s_usb_ready) return false;
-    return s_consumer.press(usage_code);
+    s_consumer.press(usage_code);
+    return true;
 }
 
 bool usb_hid_consumer_release(void) {