diff --git a/gfx/common/drm_common.c b/gfx/common/drm_common.c
index 3cc41eedd1..ee1c474bd5 100644
--- a/gfx/common/drm_common.c
+++ b/gfx/common/drm_common.c
@@ -27,7 +27,7 @@ uint32_t g_connector_id               = 0;
 int g_drm_fd                          = 0;
 uint32_t g_crtc_id                    = 0;
 
-drmModeCrtc *g_orig_crtc       = NULL;
+drmModeCrtc *g_orig_crtc              = NULL;
 
 static drmModeRes *g_drm_resources    = NULL;
 drmModeConnector *g_drm_connector     = NULL;
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index f8b410b6cd..169ef25bd1 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -1584,6 +1584,7 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
    VkPhysicalDevice *gpus           = NULL;
    union string_list_elem_attr attr = {0};
    settings_t *settings             = config_get_ptr();
+   int gpu_index                    = settings->ints.vulkan_gpu_index;
 
    if (vkEnumeratePhysicalDevices(vk->context.instance,
             &gpu_count, NULL) != VK_SUCCESS)
@@ -1633,14 +1634,14 @@ static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
 
    video_driver_set_gpu_api_devices(GFX_CTX_VULKAN_API, vulkan_gpu_list);
 
-   if (0 <= settings->ints.vulkan_gpu_index && settings->ints.vulkan_gpu_index < (int)gpu_count)
+   if (0 <= gpu_index && gpu_index < (int)gpu_count)
    {
-      RARCH_LOG("[Vulkan]: Using GPU index %d.\n", settings->ints.vulkan_gpu_index);
-      vk->context.gpu = gpus[settings->ints.vulkan_gpu_index];
+      RARCH_LOG("[Vulkan]: Using GPU index %d.\n", gpu_index);
+      vk->context.gpu = gpus[gpu_index];
    }
    else
    {
-      RARCH_WARN("[Vulkan]: Invalid GPU index %d, using first device found.\n", settings->ints.vulkan_gpu_index);
+      RARCH_WARN("[Vulkan]: Invalid GPU index %d, using first device found.\n", gpu_index);
       vk->context.gpu = gpus[0];
    }