diff --git a/360/frontend/menu.cpp b/360/frontend/menu.cpp
index 03f52a6490..dfcb0312a2 100644
--- a/360/frontend/menu.cpp
+++ b/360/frontend/menu.cpp
@@ -70,11 +70,11 @@ static void filebrowser_fetch_directory_entries(const char *path, filebrowser_t
    rompath_title->SetText(strw_buffer);
 
    romlist->DeleteItems(0, romlist->GetItemCount());
-   romlist->InsertItems(0, browser->current_dir.size);
-   for(unsigned i = 0; i < browser->current_dir.size; i++)
+   romlist->InsertItems(0, browser->current_dir.list->size);
+   for(unsigned i = 0; i < browser->current_dir.list->size; i++)
    {
       char fname_tmp[256];
-	  fill_pathname_base(fname_tmp, browser->current_dir.elems[i], sizeof(fname_tmp));
+	  fill_pathname_base(fname_tmp, browser->current_dir.list->elems[i].data, sizeof(fname_tmp));
       rarch_convert_char_to_wchar(strw_buffer, fname_tmp, sizeof(strw_buffer));
       romlist->SetText(i, strw_buffer);
    }
@@ -530,7 +530,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
    if(hObjPressed == m_romlist)
    {
       int index = m_romlist.GetCurSel();
-      if(path_file_exists(browser.current_dir.elems[index]))
+      if(path_file_exists(browser.current_dir.list->elems[index].data))
       {
          struct retro_system_info info;
          retro_get_system_info(&info);
@@ -550,7 +550,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
             rarch_settings_change(S_START_RARCH);
          }
       }
-      else if(path_is_directory(browser.current_dir.elems[index]))
+      else if(browser.current_dir.list->elems[index].attr.b)
       {
 
          const char * strbuffer = rarch_convert_wchar_to_const_char((const wchar_t *)m_romlist.GetText(index));
@@ -583,7 +583,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
    if(hObjPressed == m_shaderlist)
    {
       int index = m_shaderlist.GetCurSel();
-      if(path_file_exists(tmp_browser.current_dir.elems[index]))
+      if(path_file_exists(tmp_browser.current_dir.list->elems[index].data))
       {
          const char * strbuffer = rarch_convert_wchar_to_const_char((const wchar_t *)m_shaderlist.GetText(index));
 		 
@@ -604,7 +604,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand
          if (g_console.info_msg_enable)
             rarch_settings_msg(S_MSG_SHADER_LOADING_SUCCEEDED, S_DELAY_180);
       }
-      else if(path_is_directory(tmp_browser.current_dir.elems[index]))
+      else if(tmp_browser.current_dir.list->elems[index].attr.b)
       {
          const char * strbuffer = rarch_convert_wchar_to_const_char((const wchar_t *)m_shaderlist.GetText(index));
          snprintf(path, sizeof(path), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), strbuffer);
@@ -624,13 +624,13 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle
    if(hObjPressed == m_romlist)
    {
       int index = m_romlist.GetCurSel();
-      if(path_file_exists(tmp_browser.current_dir.elems[index]))
+      if(path_file_exists(tmp_browser.current_dir.list->elems[index].data))
       {
          const char * strbuffer = rarch_convert_wchar_to_const_char((const wchar_t *)m_romlist.GetText(index));
          snprintf(g_console.launch_app_on_exit, sizeof(g_console.launch_app_on_exit), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), strbuffer);
          rarch_settings_change(S_RETURN_TO_LAUNCHER);
       }
-      else if(path_is_directory(tmp_browser.current_dir.elems[index]))
+      else if(tmp_browser.current_dir.list->elems[index].attr.b)
       {
          const char * strbuffer = rarch_convert_wchar_to_const_char((const wchar_t *)m_romlist.GetText(index));
          snprintf(path, sizeof(path), "%s%s\\", filebrowser_get_current_dir(&tmp_browser), strbuffer);
diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp
index b13a42d827..ff5021258e 100644
--- a/360/xdk360_video.cpp
+++ b/360/xdk360_video.cpp
@@ -550,6 +550,9 @@ static void *xdk360_init(const video_info_t *video, const input_driver_t **input
 static bool xdk360_frame(void *data, const void *frame,
       unsigned width, unsigned height, unsigned pitch, const char *msg)
 {
+   if (!frame)
+      return true;
+
    xdk360_video_t *d3d9 = (xdk360_video_t*)data;
    D3DSurface* pRenderTarget0;
    bool menu_enabled = g_console.menu_enable;
diff --git a/console/libretro_mgmt.c b/console/libretro_mgmt.c
index 8c3bcb48e0..0250af2218 100644
--- a/console/libretro_mgmt.c
+++ b/console/libretro_mgmt.c
@@ -101,13 +101,13 @@ void rarch_manage_libretro_set_first_file(char *first_file, size_t size_of_first
       if(strcmp(fname_tmp, "RetroArch-Salamander.xex") == 0)
       {
          RARCH_WARN("First entry is RetroArch Salamander itself, increment entry by one and check if it exists.\n");
-	 first_exe = dir_list[1];
+	 first_exe = dir_list->elems[1].data;
 	 fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp));
 
 	 if(!first_exe)
 	 {
             RARCH_ERR("Unlikely error happened - no second entry - no choice but to set it to RetroArch Salamander\n");
-	    first_exe = dir_list[0];
+	    first_exe = dir_list->elems[0].data;
 	    fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp));
 	 }
       }
diff --git a/console/salamander/main.c b/console/salamander/main.c
index f1d4a060c5..1a334a3b03 100644
--- a/console/salamander/main.c
+++ b/console/salamander/main.c
@@ -108,13 +108,13 @@ static void rarch_manage_libretro_set_first_file(char *first_file, size_t size_o
       if(strcmp(fname_tmp, "RetroArch-Salamander.xex") == 0)
       {
          RARCH_WARN("First entry is RetroArch Salamander itself, increment entry by one and check if it exists.\n");
-	 first_exe = dir_list[1];
+	 first_exe = dir_list->elems[1].data;
 	 fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp));
 
 	 if(!first_exe)
 	 {
-            RARCH_ERR("Unlikely error happened - no second entry - no choice but to set it to RetroArch Salamander\n");
-	    first_exe = dir_list[0];
+        RARCH_ERR("Unlikely error happened - no second entry - no choice but to set it to RetroArch Salamander\n");
+	    first_exe = dir_list->elems[0].data;
 	    fill_pathname_base(fname_tmp, first_exe, sizeof(fname_tmp));
 	 }
       }