diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 646620c435..78b53f36a2 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -274,7 +274,7 @@ namespace Emby.Drawing
             string backgroundColor,
             string foregroundLayer)
         {
-            System.Text.StringBuilder filename = new System.Text.StringBuilder(128);
+            var filename = new StringBuilder(128);
             filename.Append(originalPath);
 
             filename.Append(",quality=");
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
index e1a2811ac7..230a0af60c 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessingOptions.cs
@@ -97,12 +97,7 @@ namespace MediaBrowser.Controller.Drawing
                 return false;
             }
 
-            if (FillWidth.HasValue && sizeValue.Width > FillWidth.Value)
-            {
-                return false;
-            }
-
-            if (FillHeight.HasValue && sizeValue.Height > FillHeight.Value)
+            if (sizeValue.Width > FillWidth || sizeValue.Height > FillHeight)
             {
                 return false;
             }