diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 18e35aabab..3152c65f95 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -4340,7 +4340,6 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
       case DISPLAYLIST_OPTIONS_REMAPPINGS:
          {
             unsigned p;
-            settings_t        *settings = config_get_ptr();
             unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
 
             if (menu_entries_append_enum(list,
diff --git a/retroarch.c b/retroarch.c
index f3097d75f8..0305cbb560 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -13662,7 +13662,7 @@ static int16_t input_state_device(
                         RETRO_DEVICE_ID_JOYPAD_L3,
                         RETRO_DEVICE_ID_JOYPAD_R3};
                      input_driver_turbo_btns.enable[port] = 1 << button_map[
-                        min(
+                        MIN(
                               sizeof(button_map)/sizeof(button_map[0])-1,
                               settings->uints.input_turbo_default_button)];
                   }