diff --git a/frontend/frontend_bbqnx.c b/frontend/frontend_bbqnx.c
index c2f0b9b999..d5686bbb15 100644
--- a/frontend/frontend_bbqnx.c
+++ b/frontend/frontend_bbqnx.c
@@ -34,7 +34,8 @@ int rarch_main(int argc, char *argv[])
    strlcpy(g_settings.libretro, "app/native/lib", sizeof(g_settings.libretro));
 
    config_load();
-   global_init_drivers();
+   init_drivers_pre();
+   init_drivers();
 
    g_extern.verbose = true;
 
@@ -54,6 +55,8 @@ int rarch_main(int argc, char *argv[])
       {
 	     if (g_extern.main_is_init)
 	        rarch_main_deinit();
+	     else
+	        uninit_drivers();
 
 	     struct rarch_main_wrap args = {0};
 
diff --git a/gfx/context/bbqnx_ctx.c b/gfx/context/bbqnx_ctx.c
index 156855bf61..85b68b2da7 100644
--- a/gfx/context/bbqnx_ctx.c
+++ b/gfx/context/bbqnx_ctx.c
@@ -65,7 +65,7 @@ static void gfx_ctx_destroy(void)
    eglDestroyContext(g_egl_dpy, g_egl_ctx);
    eglDestroySurface(g_egl_dpy, g_egl_surf);
    eglTerminate(g_egl_dpy);
-   eglReleaseThread();
+   //eglReleaseThread();
 
    g_egl_dpy = EGL_NO_DISPLAY;
    g_egl_surf = EGL_NO_SURFACE;