diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 3c14267c81..797ba34ee2 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -175,7 +175,7 @@ static void *menu_userdata                      = NULL;
 
 /* Quick jumping indices with L/R.
  * Rebuilt when parsing directory. */
-static size_t scroll_index_list[SCROLL_INDEX_SIZE];
+static uint8_t scroll_index_list[SCROLL_INDEX_SIZE];
 static unsigned scroll_index_size               = 0;
 static unsigned scroll_acceleration             = 0;
 static size_t menu_driver_selection_ptr         = 0;
@@ -377,11 +377,13 @@ static bool menu_display_libretro_running(
 }
 
 /* Display the libretro core's framebuffer onscreen. */
-bool menu_display_libretro(bool is_idle, bool rarch_is_inited, bool rarch_is_dummy_core)
+bool menu_display_libretro(bool is_idle,
+      bool rarch_is_inited, bool rarch_is_dummy_core)
 {
    video_driver_set_texture_enable(true, false);
 
-   if (menu_display_libretro_running(rarch_is_inited, rarch_is_dummy_core))
+   if (menu_display_libretro_running(
+            rarch_is_inited, rarch_is_dummy_core))
    {
       if (!input_driver_is_libretro_input_blocked())
          input_driver_set_libretro_input_blocked();
@@ -393,7 +395,8 @@ bool menu_display_libretro(bool is_idle, bool rarch_is_inited, bool rarch_is_dum
    }
 
    if (is_idle)
-      return true; /* Maybe return false here for indication of idleness? */
+      return true; /* Maybe return false here 
+                      for indication of idleness? */
    return video_driver_cached_frame();
 }
 
@@ -2307,9 +2310,9 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
                return false;
 
             if ((scroll_index_size + 1) >= SCROLL_INDEX_SIZE)
-               scroll_index_list[scroll_index_size]   = *sel;
+               scroll_index_list[scroll_index_size]   = (uint8_t)*sel;
             else
-               scroll_index_list[scroll_index_size++] = *sel;
+               scroll_index_list[scroll_index_size++] = (uint8_t)*sel;
          }
          break;
       case MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL: