diff --git a/NuGet.Config b/NuGet.Config
index d8519312d9..1be926e9e7 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <add key="AspNetVNext" value="https://www.myget.org/F/aspnetlitedev/api/v2" />
diff --git a/src/MusicStore.Spa/Helpers/AngularExtensions.cs b/src/MusicStore.Spa/Helpers/AngularExtensions.cs
index 41fe16f4e2..cdf3b828df 100644
--- a/src/MusicStore.Spa/Helpers/AngularExtensions.cs
+++ b/src/MusicStore.Spa/Helpers/AngularExtensions.cs
@@ -221,8 +221,8 @@ namespace Microsoft.AspNet.Mvc.Rendering
             {
                 var nullOptionTag = new TagBuilder("option");
                 nullOptionTag.Attributes["value"] = string.Empty;
-                nullOptionTag.SetInnerText(nullOption);
-                tag.InnerHtml = nullOptionTag;
+                nullOptionTag.InnerHtml.SetContent(nullOption);
+                tag.InnerHtml.SetContent(nullOptionTag);
             }
 
             var clientValidators = html.GetClientValidationRules(metadata, null);
@@ -269,19 +269,19 @@ namespace Microsoft.AspNet.Mvc.Rendering
                 if (string.Equals(validator.ValidationType, "required"))
                 {
                     tag.Attributes["ng-show"] = string.Format("({0}.submitAttempted || {0}.{1}.$dirty || {0}.{1}.visited) && {0}.{1}.$error.{2}", formName, modelName, "required");
-                    tag.SetInnerText(validator.ErrorMessage);
+                    tag.InnerHtml.SetContent(validator.ErrorMessage);
                 }
                 else if (string.Equals(validator.ValidationType, "length"))
                 {
                     tag.Attributes["ng-show"] = string.Format("({0}.submitAttempted || {0}.{1}.$dirty || {0}.{1}.visited) && ({0}.{1}.$error.minlength || {0}.{1}.$error.maxlength)",
                         formName, modelName);
-                    tag.SetInnerText(validator.ErrorMessage);
+                    tag.InnerHtml.SetContent(validator.ErrorMessage);
                 }
                 else if (string.Equals(validator.ValidationType, "range"))
                 {
                     tag.Attributes["ng-show"] = string.Format("({0}.submitAttempted || {0}.{1}.$dirty || {0}.{1}.visited) && ({0}.{1}.$error.min || {0}.{1}.$error.max)",
                         formName, modelName);
-                    tag.SetInnerText(validator.ErrorMessage);
+                    tag.InnerHtml.SetContent(validator.ErrorMessage);
                 }
                 // TODO: Regex, equalto, remote
                 else
diff --git a/src/MusicStore.Spa/Helpers/JsonExtensions.cs b/src/MusicStore.Spa/Helpers/JsonExtensions.cs
index 0e7e55f88f..1d7f93cdd5 100644
--- a/src/MusicStore.Spa/Helpers/JsonExtensions.cs
+++ b/src/MusicStore.Spa/Helpers/JsonExtensions.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Mvc.Rendering
 
             var innerContent = data is JsonString ? data.ToString() : JsonConvert.SerializeObject(data);
             innerContent.Replace("<", "\u003C").Replace(">", "\u003E");
-            builder.InnerHtml = new HtmlString(innerContent);
+            builder.InnerHtml.SetContentEncoded(innerContent);
 
             return builder;
         }