diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 1f9826d54e..32c93454d2 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -283,11 +283,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                             }
                         }
 
-                        if (!process.WaitForExit(5000))
-                        {
-                            StopProcess(processWrapper, 100, true);
-                        }
-
                         return mediaInfo;
                     }
                 }
diff --git a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
index d171c4aa46..504df02d50 100644
--- a/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
+++ b/MediaBrowser.Providers/Movies/GenericMovieDbInfo.cs
@@ -258,7 +258,14 @@ namespace MediaBrowser.Providers.Movies
             {
                 foreach (var person in movieData.casts.crew)
                 {
-                    resultItem.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = person.department });
+                    // Normalize this
+                    var type = person.department;
+                    if (string.Equals(type, "writing", StringComparison.OrdinalIgnoreCase))
+                    {
+                        type = PersonType.Writer;
+                    }
+
+                    resultItem.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = type });
                 }
             }