diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 12a41b29b8..6c14de45f0 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -405,7 +405,7 @@ static void render_text(rgui_handle_t *rgui)
 
    render_background(rgui);
 
-   char title[TERM_WIDTH];
+   char title[256];
    const char *dir = 0;
    rgui_file_type_t menu_type = 0;
    rgui_list_back(rgui->path_stack, &dir, &menu_type, NULL);
@@ -433,8 +433,8 @@ static void render_text(rgui_handle_t *rgui)
       const char *path = 0;
       rgui_file_type_t type = 0;
       rgui_list_at(rgui->folder_buf, i, &path, &type, NULL);
-      char message[TERM_WIDTH + 1];
-      char type_str[TERM_WIDTH + 1];
+      char message[256];
+      char type_str[256];
       int w = rgui_is_controller_menu(menu_type) ? 26 : 19;
 #ifdef RARCH_CONSOLE
       unsigned port = menu_type - RGUI_SETTINGS_CONTROLLER_1;
@@ -561,7 +561,7 @@ static void render_text(rgui_handle_t *rgui)
       }
 
       const char *entry_title;
-      char tmp[TERM_WIDTH];
+      char tmp[256];
       size_t path_len = strlen(path);
       // trim long filenames
       if ((type == RGUI_FILE_PLAIN || type == RGUI_FILE_DIRECTORY) && path_len > TERM_WIDTH - (w + 1 + 2))
diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c
index 1457e95c02..7475cafc08 100644
--- a/gfx/context/xdk_ctx.c
+++ b/gfx/context/xdk_ctx.c
@@ -404,12 +404,9 @@ const gfx_ctx_driver_t gfx_ctx_xdk = {
    gfx_ctx_write_egl_image,
    NULL,
    "xdk",
-
-   // RARCH_CONSOLE stuff.
+#if defined(HAVE_RMENU)
    gfx_ctx_xdk_get_available_resolutions,
    gfx_ctx_xdk_check_resolution,
-
-#if defined(HAVE_RMENU)
    gfx_ctx_xdk_menu_init,
    gfx_ctx_xdk_menu_frame,
    gfx_ctx_xdk_menu_free,