diff --git a/esp-wifi/Cargo.toml b/esp-wifi/Cargo.toml
index a9c0b4880a7..7de49d5319b 100644
--- a/esp-wifi/Cargo.toml
+++ b/esp-wifi/Cargo.toml
@@ -60,7 +60,11 @@ toml-cfg.workspace = true
 
 [dev-dependencies]
 esp-println = { workspace = true, features = ["log"] }
-esp-backtrace.workspace = true
+esp-backtrace = { workspace = true, features = [
+    "panic-handler",
+    "exception-handler",
+    "print-uart",
+] }
 embassy-executor.workspace = true
 embassy-time.workspace = true
 embassy-net.workspace = true
diff --git a/esp-wifi/examples/embassy_access_point.rs b/esp-wifi/examples/embassy_access_point.rs
index 61df36b562c..a4832f8442b 100644
--- a/esp-wifi/examples/embassy_access_point.rs
+++ b/esp-wifi/examples/embassy_access_point.rs
@@ -50,7 +50,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::ipv4_static(StaticConfigV4 {
         address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),
diff --git a/esp-wifi/examples/embassy_access_point_with_sta.rs b/esp-wifi/examples/embassy_access_point_with_sta.rs
index 82fd8a15a4e..4e0ebb866cf 100644
--- a/esp-wifi/examples/embassy_access_point_with_sta.rs
+++ b/esp-wifi/examples/embassy_access_point_with_sta.rs
@@ -55,7 +55,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_ap_sta(&init, wifi).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let ap_config = Config::ipv4_static(StaticConfigV4 {
         address: Ipv4Cidr::new(Ipv4Address::new(192, 168, 2, 1), 24),
diff --git a/esp-wifi/examples/embassy_bench.rs b/esp-wifi/examples/embassy_bench.rs
index 622a9f64615..07c7cb5a2f8 100644
--- a/esp-wifi/examples/embassy_bench.rs
+++ b/esp-wifi/examples/embassy_bench.rs
@@ -63,7 +63,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiApDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::dhcpv4(Default::default());
 
diff --git a/esp-wifi/examples/embassy_ble.rs b/esp-wifi/examples/embassy_ble.rs
index 963625f306d..d0be56f9afe 100644
--- a/esp-wifi/examples/embassy_ble.rs
+++ b/esp-wifi/examples/embassy_ble.rs
@@ -66,7 +66,7 @@ async fn main(_spawner: Spawner) -> ! {
     .unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let mut bluetooth = peripherals.BT;
 
diff --git a/esp-wifi/examples/embassy_dhcp.rs b/esp-wifi/examples/embassy_dhcp.rs
index 80a137d07a3..ca8697d9398 100644
--- a/esp-wifi/examples/embassy_dhcp.rs
+++ b/esp-wifi/examples/embassy_dhcp.rs
@@ -51,7 +51,7 @@ async fn main(spawner: Spawner) -> ! {
         esp_wifi::wifi::new_with_mode(&init, wifi, WifiStaDevice).unwrap();
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let config = Config::dhcpv4(Default::default());
 
diff --git a/esp-wifi/examples/embassy_esp_now.rs b/esp-wifi/examples/embassy_esp_now.rs
index f3e47087b24..b1a12342926 100644
--- a/esp-wifi/examples/embassy_esp_now.rs
+++ b/esp-wifi/examples/embassy_esp_now.rs
@@ -45,7 +45,7 @@ async fn main(_spawner: Spawner) -> ! {
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let mut ticker = Ticker::every(Duration::from_secs(5));
     loop {
diff --git a/esp-wifi/examples/embassy_esp_now_duplex.rs b/esp-wifi/examples/embassy_esp_now_duplex.rs
index f2e7c5d2576..43cdfdcbb8f 100644
--- a/esp-wifi/examples/embassy_esp_now_duplex.rs
+++ b/esp-wifi/examples/embassy_esp_now_duplex.rs
@@ -48,7 +48,7 @@ async fn main(spawner: Spawner) -> ! {
     println!("esp-now version {}", esp_now.get_version().unwrap());
 
     let timer_group0 = TimerGroup::new(peripherals.TIMG0, &clocks);
-    embassy::init(&clocks, timer_group0.timer0);
+    embassy::init(&clocks, timer_group0);
 
     let (manager, sender, receiver) = esp_now.split();
     let manager = make_static!(manager);
diff --git a/esp-wifi/src/wifi/mod.rs b/esp-wifi/src/wifi/mod.rs
index e17cd359096..94358535aa6 100644
--- a/esp-wifi/src/wifi/mod.rs
+++ b/esp-wifi/src/wifi/mod.rs
@@ -1269,7 +1269,7 @@ fn convert_ap_info(record: &include::wifi_ap_record_t) -> AccessPointInfo {
         },
         signal_strength: record.rssi,
         protocols: EnumSet::empty(), // TODO
-        auth_method: AuthMethod::from_raw(record.authmode),
+        auth_method: Some(AuthMethod::from_raw(record.authmode)),
     }
 }