diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 9aad67ec70..265c043b98 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -282,12 +282,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
 
+        /// <summary>
+        /// With the given path string, replaces the filename with ffprobe, taking case
+        /// of any file extension (like .exe on windows).
+        /// </summary>
+        /// <param name="appPath"></param>
+        /// <returns></returns>
         private string GetProbePathFromEncoderPath(string appPath)
         {
             if (!string.IsNullOrEmpty(appPath))
             {
-                string pattern = @"[^\/\\]+?(\.[^\/\\\n.]+)?$";
-                string substitution = @"ffprobe$1";
+                const string pattern = @"[^\/\\]+?(\.[^\/\\\n.]+)?$";
+                const string substitution = @"ffprobe$1";
 
                 return Regex.Replace(appPath, pattern, substitution);
             }
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index ff697437ac..7fc985ba02 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -8,8 +8,14 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableThrottling { get; set; }
         public int ThrottleDelaySeconds { get; set; }
         public string HardwareAccelerationType { get; set; }
-        public string EncoderAppPathCustom { get; set; } // FFmpeg path as set by the user via the UI
-        public string EncoderAppPath { get; set; } // The current FFmpeg path being used by the system
+        /// <summary>
+        /// FFmpeg path as set by the user via the UI
+        /// </summary>
+        public string EncoderAppPathCustom { get; set; }
+        /// <summary>
+        /// The current FFmpeg path being used by the system
+        /// </summary>
+        public string EncoderAppPath { get; set; }
         public string VaapiDevice { get; set; }
         public int H264Crf { get; set; }
         public string H264Preset { get; set; }