diff --git a/command_event.c b/command_event.c
index bf1a0defdb..969cebc8ac 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1313,7 +1313,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data)
       case EVENT_CMD_CORE_DEINIT:
          {
             struct retro_hw_render_callback *hwr =
-               hwr = video_driver_get_hw_context();
+               video_driver_get_hw_context();
             event_deinit_core(true);
 
             if (hwr)
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index e02995fac4..412529d79b 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -980,7 +980,7 @@ static void *vulkan_init(const video_info_t *video,
    if (!ctx_driver)
       goto error;
 
-   video_context_driver_set((void*)ctx_driver);
+   video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
 
    video_context_driver_get_video_size(&mode);
    full_x = mode.width;