diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 970b463cd..231bfa2b4 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -227,6 +227,9 @@ namespace Emby.Drawing
                     imageProcessingLockTaken = true;
 
                     _imageEncoder.EncodeImage(originalImagePath, cacheFilePath, newWidth, newHeight, quality, options);
+
+                    // ImageMagick doesn't seem to always release it right away
+                    await Task.Delay(100).ConfigureAwait(false);
                 }
             }
             finally
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index e0cc1b705..810d42a09 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -759,14 +759,12 @@ namespace MediaBrowser.Model.Dlna
 
                 if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
                 {
-                    if (!requiresConversion)
+                    if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
                     {
-                        return profile;
-                    }
-
-                    if (subtitleStream.SupportsExternalStream)
-                    {
-                        return profile;
+                        if (subtitleStream.SupportsExternalStream)
+                        {
+                            return profile;
+                        }
                     }
 
                     // For sync we can handle the longer extraction times
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index e3ec99392..63067bf5a 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -127,9 +127,12 @@ namespace MediaBrowser.Server.Implementations.Library
                 {
                     var supportsExternalStream = StreamSupportsExternalStream(subStream);
 
-                    if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream)
+                    if (!subStream.IsExternal)
                     {
-                        supportsExternalStream = false;
+                        if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream)
+                        {
+                            supportsExternalStream = false;
+                        }
                     }
 
                     subStream.SupportsExternalStream = supportsExternalStream;
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 18fcb4e79..f7a87dad5 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -539,11 +539,6 @@ namespace MediaBrowser.Server.Implementations.Sync
                         return false;
                     }
 
-                    if (video.IsStacked)
-                    {
-                        return false;
-                    }
-
                     if (video.IsShortcut)
                     {
                         return false;