diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 7bad3af2ed..8a153e2ac6 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -1597,11 +1597,11 @@ end:
 
 static bool vulkan_context_init_gpu(gfx_ctx_vulkan_data_t *vk)
 {
-   uint32_t gpu_count     = 0;
-   VkPhysicalDevice *gpus = NULL;
-   int i;
+   unsigned i;
+   uint32_t gpu_count               = 0;
+   VkPhysicalDevice *gpus           = NULL;
    union string_list_elem_attr attr = {0};
-   settings_t *settings = config_get_ptr();
+   settings_t *settings             = config_get_ptr();
 
    if (vk->context.gpu != VK_NULL_HANDLE)
       return true;
@@ -1654,7 +1654,7 @@ 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 < gpu_count)
+   if (0 <= settings->ints.vulkan_gpu_index && settings->ints.vulkan_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];
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index c3d0131e07..035f07c28d 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -385,9 +385,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
 
          if (list)
          {
-            if (settings->ints.vulkan_gpu_index < list->size - 1)
+            if (settings->ints.vulkan_gpu_index <(int)(list->size - 1))
                settings->ints.vulkan_gpu_index++;
-            else if (settings->ints.vulkan_gpu_index == list->size - 1)
+            else if (settings->ints.vulkan_gpu_index == (int)(list->size - 1))
                settings->ints.vulkan_gpu_index = 0;
          }
 
@@ -401,9 +401,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
 
          if (list)
          {
-            if (settings->ints.d3d10_gpu_index < list->size - 1)
+            if (settings->ints.d3d10_gpu_index < (int)(list->size - 1))
                settings->ints.d3d10_gpu_index++;
-            else if (settings->ints.d3d10_gpu_index == list->size - 1)
+            else if (settings->ints.d3d10_gpu_index == (int)(list->size - 1))
                settings->ints.d3d10_gpu_index = 0;
          }