diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 483196b2d6..67ce8db15c 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -587,7 +587,7 @@ static int manual_content_scan_system_name_left(
       if (current_index > 0)
          next_index = current_index - 1;
       else if (wraparound && (system_name_list->size > 1))
-         next_index = system_name_list->size - 1;
+         next_index = (unsigned)(system_name_list->size - 1);
    }
 
    /* Get new system name parameters */
@@ -643,7 +643,7 @@ static int manual_content_scan_core_name_left(unsigned type, const char *label,
       if (current_index > 0)
          next_index = current_index - 1;
       else if (wraparound && (core_name_list->size > 1))
-         next_index = core_name_list->size - 1;
+         next_index = (unsigned)(core_name_list->size - 1);
    }
 
    /* Get new core name parameters */
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 5b20370647..e99cfff689 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -566,7 +566,7 @@ int generic_action_ok_displaylist_push(const char *path,
          dl_type            = DISPLAYLIST_GENERIC;
          break;
       case ACTION_OK_DL_DROPDOWN_BOX_LIST_SHADER_PARAMETER:
-         info.type          = MENU_SETTINGS_SHADER_PARAMETER_0 + idx;
+         info.type          = (unsigned)(MENU_SETTINGS_SHADER_PARAMETER_0 + idx);
          info.directory_ptr = idx;
          info_path          = path;
          info_label         = msg_hash_to_str(