diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c
index 720068a75b..227e5e321a 100644
--- a/input/connect/joypad_connection.c
+++ b/input/connect/joypad_connection.c
@@ -91,7 +91,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
       {
          for (i = 0; name && pad_map[i].name; i++)
          {
-            char *name_match = strstr(name, pad_map[i].name);
+            const char *name_match = strstr(name, pad_map[i].name);
 
             if (name_match || (pad_map[i].vid == vid && pad_map[i].pid == pid))
             {
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index d0886ff48e..765fe57689 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1309,7 +1309,7 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
       const char *query)
 {
 #ifdef HAVE_LIBRETRODB
-   int i;
+   unsigned i;
    database_info_list_t *db_list = database_info_list_new(path, query);
 
    if (!db_list)