diff --git a/general.h b/general.h
index 967b4e7412..a26e42b276 100644
--- a/general.h
+++ b/general.h
@@ -266,7 +266,7 @@ struct console_settings
    char launch_app_on_exit[PATH_MAX];
    float menu_font_size;
 #ifdef HAVE_OSKUTIL
-   void *oskutil_handle;
+   oskutil_params oskutil_handle;
 #endif
 };
 #endif
diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c
index 4a9611f4ea..1d6a58a114 100644
--- a/gfx/context/ps3_ctx.c
+++ b/gfx/context/ps3_ctx.c
@@ -17,6 +17,10 @@
 #include "../../driver.h"
 #include "../../ps3/sdk_defines.h"
 
+#ifndef __PSL1GHT__
+#include <sys/spu_initialize.h>
+#endif
+
 #include <stdint.h>
 
 #ifdef HAVE_CONFIG_H
@@ -143,9 +147,9 @@ void gfx_ctx_set_swap_interval(unsigned interval, bool inited)
    if (gl_context)
    {
       if (interval)
-         glEnable(GL_VSYNC);
+         glEnable(GL_VSYNC_SCE);
       else
-         glDisable(GL_VSYNC);
+         glDisable(GL_VSYNC_SCE);
    }
 #endif
 }
diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c
index 1174a516bf..9c176edb17 100644
--- a/ps3/frontend/main.c
+++ b/ps3/frontend/main.c
@@ -90,7 +90,7 @@ static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdat
    (void) param;
    (void) userdata;
 #ifdef HAVE_OSKUTIL
-   oskutil_params *osk = g_console.oskutil_handle;
+   oskutil_params *osk = &g_console.oskutil_handle;
 #endif
    gl_t *gl = driver.video_data;
 
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
    driver.video = &video_gl;
 
 #ifdef HAVE_OSKUTIL
-   oskutil_params *osk = g_console.oskutil_handle;
+   oskutil_params *osk = &g_console.oskutil_handle;
    oskutil_init(osk, 0);
 #endif
 
@@ -373,11 +373,8 @@ begin_shutdown:
    menu_free();
 
 #ifdef HAVE_OSKUTIL
-   if(g_console.oskutil_handle)
-   {
-      oskutil_params *osk = g_console.oskutil_handle;
+   if(osk)
       oskutil_unload(osk);
-   }
 #endif
 
 #ifdef HAVE_LOGGER