diff --git a/gfx/drivers_font/vulkan_raster_font.c b/gfx/drivers_font/vulkan_raster_font.c
index c1036d217d..871c5f6e4c 100644
--- a/gfx/drivers_font/vulkan_raster_font.c
+++ b/gfx/drivers_font/vulkan_raster_font.c
@@ -271,15 +271,15 @@ static void vulkan_raster_font_render_message(
 
 static void vulkan_raster_font_flush(vulkan_raster_t *font)
 {
-   const struct vk_draw_triangles call = {
-      font->vk->pipelines.font,
-      &font->texture_optimal,
-      font->vk->samplers.mipmap_linear,
-      &font->vk->mvp,
-      sizeof(font->vk->mvp),
-      &font->range,
-      font->vertices,
-   };
+   struct vk_draw_triangles call;
+   
+   call.pipeline     = font->vk->pipelines.font;
+   call.texture      = &font->texture_optimal;
+   call.sampler      = font->vk->samplers.mipmap_linear;
+   call.uniform      = &font->vk->mvp;
+   call.uniform_size = sizeof(font->vk->mvp);
+   call.vbo          = &font->range;
+   call.vertices     = font->vertices;
 
    if(font->needs_update)
    {
diff --git a/ui/drivers/win32/ui_win32_browser_window.c b/ui/drivers/win32/ui_win32_browser_window.c
index 93dcaa8a55..61c05e6907 100644
--- a/ui/drivers/win32/ui_win32_browser_window.c
+++ b/ui/drivers/win32/ui_win32_browser_window.c
@@ -25,17 +25,33 @@
 
 static bool ui_browser_window_win32_core(ui_browser_window_state_t *state, bool save)
 {
-   OPENFILENAME ofn = {};
+   OPENFILENAME ofn;
 
-   ofn.lStructSize     = sizeof(OPENFILENAME);
-   ofn.hwndOwner       = (HWND)state->window;
-   ofn.lpstrFilter     = state->filters; /* actually const */
-   ofn.lpstrFile       = state->path;
-   ofn.lpstrTitle      = state->title;
-   ofn.lpstrInitialDir = state->startdir;
-   ofn.lpstrDefExt     = "";
-   ofn.nMaxFile        = PATH_MAX;
-   ofn.Flags           = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+   ofn.lStructSize       = sizeof(OPENFILENAME);
+   ofn.hwndOwner         = (HWND)state->window;
+   ofn.hInstance         = NULL;
+   ofn.lpstrFilter       = state->filters; /* actually const */
+   ofn.lpstrCustomFilter = NULL;
+   ofn.nMaxCustFilter    = 0;
+   ofn.nFilterIndex      = 0;
+   ofn.lpstrFile         = state->path;
+   ofn.nMaxFile          = PATH_MAX;
+   ofn.lpstrFileTitle    = NULL;
+   ofn.nMaxFileTitle     = 0;
+   ofn.lpstrInitialDir   = state->startdir;
+   ofn.lpstrTitle        = state->title;
+   ofn.Flags             = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
+   ofn.nFileOffset       = 0;
+   ofn.nFileExtension    = 0;
+   ofn.lpstrDefExt       = "";
+   ofn.lCustData         = 0;
+   ofn.lpfnHook          = NULL;
+   ofn.lpTemplateName    = NULL;
+#if (_WIN32_WINNT >= 0x0500)
+   ofn.pvReserved        = NULL;
+   ofn.dwReserved        = 0;
+   ofn.FlagsEx           = 0;
+#endif 
 
    if (!save && !GetOpenFileName(&ofn))
       return false;