diff --git a/apps/main/apps.cpp b/apps/main/apps.cpp
index 01f2fdb..61658c2 100644
--- a/apps/main/apps.cpp
+++ b/apps/main/apps.cpp
@@ -1945,6 +1945,7 @@ int app_deinit(int deinit_case)
     int nRet = 0;
     TRACE(2,"%s case:%d",__func__, deinit_case);
     app_tws_if_trigger_role_switch();
+    osDelay(200); // This is a hack; a hackkitttyy hack. To wait for the tws exchange to occur
 #ifdef WL_DET
     app_mic_alg_audioloop(false,APP_SYSFREQ_78M);
 #endif
diff --git a/services/bt_app/app_bt.cpp b/services/bt_app/app_bt.cpp
index a2c74c8..e8afb9e 100644
--- a/services/bt_app/app_bt.cpp
+++ b/services/bt_app/app_bt.cpp
@@ -4844,7 +4844,12 @@ uint32_t app_bt_restore_hid_app_ctx(uint8_t *buf)
 uint32_t app_bt_restore_hid_app_ctx(uint8_t *buf)
 {return  4;}
 uint32_t app_bt_save_hid_app_ctx(uint8_t *buf)
-{return  4;}
+{
+    buf[0]=0;
+    buf[1]=0;
+    buf[2]=0;
+    buf[3]=0;
+    return  4;}
 
 #endif
 #endif /* ENHANCED_STACK */