diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index 9279fd8d73..08add952a7 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -349,13 +349,13 @@ namespace MediaBrowser.Server.Implementations.IO
         {
             try
             {
-                Logger.Debug("Watcher sees change of type " + e.ChangeType + " to " + e.FullPath);
+                Logger.Debug("Changed detected of type " + e.ChangeType + " to " + e.FullPath);
 
                 ReportFileSystemChanged(e.FullPath);
             }
             catch (Exception ex)
             {
-                Logger.ErrorException("Exception in watcher changed. Path: {0}", ex, e.FullPath);
+                Logger.ErrorException("Exception in ReportFileSystemChanged. Path: {0}", ex, e.FullPath);
             }
         }
 
@@ -397,14 +397,6 @@ namespace MediaBrowser.Server.Implementations.IO
                         Logger.Debug("Ignoring change to {0}", path);
                         return true;
                     }
-
-                    // Go up another level
-                    parent = Path.GetDirectoryName(i);
-                    if (string.Equals(parent, path, StringComparison.OrdinalIgnoreCase))
-                    {
-                        Logger.Debug("Ignoring change to {0}", path);
-                        return true;
-                    }
                 }
 
                 return false;
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 99afbbdd70..f102dddaa6 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -404,6 +404,10 @@ namespace MediaBrowser.WebDashboard.Api
                                       //"chromecast.js",
                                       "contextmenu.js",
 
+                                      "mediacontroller.js",
+                                      "mediaplayer.js",
+                                      "mediaplayer-video.js",
+
                                       "ratingdialog.js",
                                       "aboutpage.js",
                                       "allusersettings.js",
@@ -461,10 +465,6 @@ namespace MediaBrowser.WebDashboard.Api
                                       "loginpage.js",
                                       "logpage.js",
                                       "medialibrarypage.js",
-                                      "mediaplayer.js",
-
-                                      "mediaplayer-video.js",
-
                                       "metadataconfigurationpage.js",
                                       "metadataimagespage.js",
                                       "moviegenres.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 6a8cc49b1a..6c6487cc2f 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -587,6 +587,9 @@
     <Content Include="dashboard-ui\scripts\editorsidebar.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\mediacontroller.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\mediaplayer-video.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>