diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 2f03b81e06..f82b77b60d 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -1088,7 +1088,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk,
 
             surf_info.sType  = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
             surf_info.flags  = 0;
-            surf_info.dpy    = *(const Display*)display;
+            surf_info.dpy    = (Display*)display;
             surf_info.window = *(const Window*)surface;
 
             if (vk->fpCreateXlibSurfaceKHR(vk->context.instance,
@@ -1262,6 +1262,8 @@ bool vulkan_create_swapchain(gfx_ctx_vulkan_data_t *vk,
    VkExtent2D swapchain_size;
    VkSwapchainKHR old_swapchain;
    VkSurfaceTransformFlagBitsKHR pre_transform;
+
+   /* TODO: Properly query these. */
    VkPresentModeKHR swapchain_present_mode = swap_interval 
       ? VK_PRESENT_MODE_FIFO_KHR : VK_PRESENT_MODE_MAILBOX_KHR;
    VkSwapchainCreateInfoKHR info = { VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR };
diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
index af85d47450..6a2030bd4f 100644
--- a/gfx/drivers_context/glx_ctx.c
+++ b/gfx/drivers_context/glx_ctx.c
@@ -249,7 +249,8 @@ static void gfx_ctx_glx_check_window(void *data, bool *quit,
    {
       case GFX_CTX_VULKAN_API:
 #ifdef HAVE_VULKAN
-         glx->vk.need_new_swapchain = *resize;
+         if (glx->vk.need_new_swapchain)
+            *resize = true;
 #endif
          break;