diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs
index 70f3299466..564cfa93a6 100644
--- a/MediaBrowser.Api/BaseApiService.cs
+++ b/MediaBrowser.Api/BaseApiService.cs
@@ -362,7 +362,8 @@ namespace MediaBrowser.Api
             var first = pathInfo.GetArgumentValue<string>(0);
 
             // backwards compatibility
-            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))
             {
                 index++;
             }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index f9184f6d1d..0da34efc67 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             if (_denyIframeEmbedding())
             {
-                res.AddHeader("X-Frame-Options", "DENY");
+                res.AddHeader("X-Frame-Options", "SAMEORIGIN");
             }
 
             var exception = dto as Exception;
diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
index f29807890d..9764fe612b 100644
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@@ -657,8 +657,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "librarymenu.css",
                                       "librarybrowser.css",
                                       "card.css",
-                                      "tileitem.css",
-                                      "metadataeditor.css",
                                       "notifications.css",
                                       "search.css",
                                       "pluginupdates.css",