diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs
index d3ed270b8..c56a2b54a 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/AudioImagesTask.cs
@@ -46,14 +46,14 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
         private readonly List<Audio> _newlyAddedItems = new List<Audio>();
 
-        private const int NewItemDelay = 300000;
+        private const int NewItemDelay = 60000;
 
         /// <summary>
         /// The current new item timer
         /// </summary>
         /// <value>The new item timer.</value>
         private Timer NewItemTimer { get; set; }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioImagesTask" /> class.
         /// </summary>
@@ -118,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
             foreach (var item in newSongs
                 .Where(i => i.LocationType == LocationType.FileSystem && string.IsNullOrEmpty(i.PrimaryImagePath) && i.MediaStreams.Any(m => m.Type == MediaStreamType.Video))
-                .Take(20))
+                .Take(10))
             {
                 try
                 {
@@ -130,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
                 }
             }
         }
-        
+
         /// <summary>
         /// Gets the name of the task
         /// </summary>
@@ -216,7 +216,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
             var filename = item.Album ?? string.Empty;
 
-            filename += album == null ? item.Id.ToString("N") + item.DateModified.Ticks : album.Id.ToString() + album.DateModified.Ticks;
+            filename += album == null ? item.Id.ToString("N") + item.DateModified.Ticks : album.Id.ToString("N") + album.DateModified.Ticks;
 
             var path = ImageCache.GetResourcePath(filename + "_primary", ".jpg");
 
@@ -232,7 +232,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
                 {
                     try
                     {
-                        await _mediaEncoder.ExtractImage(new[] {item.Path}, InputType.AudioFile, null, path, cancellationToken).ConfigureAwait(false);
+                        await _mediaEncoder.ExtractImage(new[] { item.Path }, InputType.AudioFile, null, path, cancellationToken).ConfigureAwait(false);
                     }
                     finally
                     {
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
index 87b99973d..4178d4f8b 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
         private readonly List<Video> _newlyAddedItems = new List<Video>();
 
-        private const int NewItemDelay = 300000;
+        private const int NewItemDelay = 60000;
 
         /// <summary>
         /// The current new item timer
@@ -95,7 +95,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
             foreach (var item in newItems
                 .Where(i => i.LocationType == LocationType.FileSystem && string.IsNullOrEmpty(i.PrimaryImagePath) && i.MediaStreams.Any(m => m.Type == MediaStreamType.Video))
-                .Take(5))
+                .Take(1))
             {
                 try
                 {
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
index 6082b629e..a343943f7 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/RefreshMediaLibraryTask.cs
@@ -1,11 +1,11 @@
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Tasks;
+using MediaBrowser.Server.Implementations.Library;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Server.Implementations.Library;
 
 namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
index dcceb382c..f0afe6358 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
         private readonly List<BaseItem> _newlyAddedItems = new List<BaseItem>();
 
-        private const int NewItemDelay = 300000;
+        private const int NewItemDelay = 60000;
 
         /// <summary>
         /// The current new item timer
@@ -124,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
                 NewItemTimer = null;
             }
 
-            foreach (var item in GetItemsForExtraction(newItems.Take(5)))
+            foreach (var item in GetItemsForExtraction(newItems.Take(3)))
             {
                 try
                 {
@@ -215,7 +215,8 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
 
             var videos = allItems.OfType<Video>().ToList();
 
-            var items = videos;
+            var items = videos.ToList();
+
             items.AddRange(localTrailers);
 
             items.AddRange(themeVideos);