diff --git a/Emby.Common.Implementations/project.fragment.lock.json b/Emby.Common.Implementations/project.fragment.lock.json
index 6a89a6320..0d8df5a0e 100644
--- a/Emby.Common.Implementations/project.fragment.lock.json
+++ b/Emby.Common.Implementations/project.fragment.lock.json
@@ -5,30 +5,23 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
+        "bin/Release/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
-      },
-      "contentFiles": {
-        "bin/Debug/MediaBrowser.Common.pdb": {
-          "buildAction": "None",
-          "codeLanguage": "any",
-          "copyToOutput": true
-        }
+        "bin/Release/MediaBrowser.Common.dll": {}
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Debug/MediaBrowser.Model.pdb": {
+        "bin/Release/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true
diff --git a/Emby.Dlna/project.fragment.lock.json b/Emby.Dlna/project.fragment.lock.json
index 09e853c1c..df837d207 100644
--- a/Emby.Dlna/project.fragment.lock.json
+++ b/Emby.Dlna/project.fragment.lock.json
@@ -5,47 +5,33 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
+        "bin/Release/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
-      },
-      "contentFiles": {
-        "bin/Debug/MediaBrowser.Common.pdb": {
-          "buildAction": "None",
-          "codeLanguage": "any",
-          "copyToOutput": true
-        }
+        "bin/Release/MediaBrowser.Common.dll": {}
       }
     },
     "MediaBrowser.Controller/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Controller.dll": {}
+        "bin/Release/MediaBrowser.Controller.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Controller.dll": {}
-      },
-      "contentFiles": {
-        "bin/Debug/MediaBrowser.Controller.pdb": {
-          "buildAction": "None",
-          "codeLanguage": "any",
-          "copyToOutput": true
-        }
+        "bin/Release/MediaBrowser.Controller.dll": {}
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Debug/MediaBrowser.Model.pdb": {
+        "bin/Release/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 85877cc5a..5ae7f11b5 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -310,24 +310,24 @@ namespace MediaBrowser.LocalMetadata.Savers
                 writer.WriteElementString("ContentRating", item.OfficialRating);
             }
 
-            //if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
-            //{
-            //    builder.Append("<MPAADescription>" + SecurityElement.Escape(item.OfficialRatingDescription) + "</MPAADescription>");
-            //}
+            if (!string.IsNullOrEmpty(item.OfficialRatingDescription))
+            {
+                writer.WriteElementString("MPAADescription", item.OfficialRatingDescription);
+            }
 
-            //builder.Append("<Added>" + SecurityElement.Escape(item.DateCreated.ToLocalTime().ToString("G")) + "</Added>");
+            writer.WriteElementString("Added", item.DateCreated.ToLocalTime().ToString("G"));
 
-            //builder.Append("<LockData>" + item.IsLocked.ToString().ToLower() + "</LockData>");
+            writer.WriteElementString("LockData", item.IsLocked.ToString().ToLower());
 
-            //if (item.LockedFields.Count > 0)
-            //{
-            //    builder.Append("<LockedFields>" + string.Join("|", item.LockedFields.Select(i => i.ToString()).ToArray()) + "</LockedFields>");
-            //}
+            if (item.LockedFields.Count > 0)
+            {
+                writer.WriteElementString("LockedFields", string.Join("|", item.LockedFields.Select(i => i.ToString()).ToArray()));
+            }
 
-            //if (!string.IsNullOrEmpty(item.DisplayMediaType))
-            //{
-            //    builder.Append("<Type>" + SecurityElement.Escape(item.DisplayMediaType) + "</Type>");
-            //}
+            if (!string.IsNullOrEmpty(item.DisplayMediaType))
+            {
+                writer.WriteElementString("Type", item.DisplayMediaType);
+            }
 
             //if (item.CriticRating.HasValue)
             //{
diff --git a/Mono.Nat/project.fragment.lock.json b/Mono.Nat/project.fragment.lock.json
index 6a89a6320..0d8df5a0e 100644
--- a/Mono.Nat/project.fragment.lock.json
+++ b/Mono.Nat/project.fragment.lock.json
@@ -5,30 +5,23 @@
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
+        "bin/Release/MediaBrowser.Common.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Common.dll": {}
-      },
-      "contentFiles": {
-        "bin/Debug/MediaBrowser.Common.pdb": {
-          "buildAction": "None",
-          "codeLanguage": "any",
-          "copyToOutput": true
-        }
+        "bin/Release/MediaBrowser.Common.dll": {}
       }
     },
     "MediaBrowser.Model/1.0.0": {
       "type": "project",
       "framework": ".NETPortable,Version=v4.5,Profile=Profile7",
       "compile": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "runtime": {
-        "bin/Debug/MediaBrowser.Model.dll": {}
+        "bin/Release/MediaBrowser.Model.dll": {}
       },
       "contentFiles": {
-        "bin/Debug/MediaBrowser.Model.pdb": {
+        "bin/Release/MediaBrowser.Model.pdb": {
           "buildAction": "None",
           "codeLanguage": "any",
           "copyToOutput": true