diff --git a/build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1 b/build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1
index feece180fc..19681dcba0 100644
--- a/build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1
+++ b/build/Modules/Umbraco.Build/Set-UmbracoVersion.ps1
@@ -55,7 +55,7 @@ function Set-UmbracoVersion
     "$release" 
   Replace-FileText "$($uenv.SolutionRoot)\src\Umbraco.Core\Configuration\UmbracoVersion.cs" `
     "CurrentComment { get { return `"(.+)`"" `
-    "CurrentComment { get { return `"$semver.PreRelease`""
+    "CurrentComment { get { return `"$($semver.PreRelease)`""
   Write-Host "Update SolutionInfo.cs"
   Replace-FileText "$($uenv.SolutionRoot)\src\SolutionInfo.cs" `
     "AssemblyFileVersion\(`"(.+)?`"\)" `
diff --git a/build/Modules/Umbraco.Build/Umbraco.Build.psm1 b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
index b303d03da1..a8f9855792 100644
--- a/build/Modules/Umbraco.Build/Umbraco.Build.psm1
+++ b/build/Modules/Umbraco.Build/Umbraco.Build.psm1
@@ -154,6 +154,7 @@ function Compile-Umbraco
   &$uenv.VisualStudio.MsBuild "$src\Umbraco.Web.UI\Umbraco.Web.UI.csproj" `
     /p:WarningLevel=0 `
     /p:Configuration=$buildConfiguration `
+    /p:Platform=AnyCPU `
     /p:UseWPP_CopyWebApplication=True `
     /p:PipelineDependsOnBuild=False `
     /p:OutDir=$tmp\bin\\ `
@@ -230,6 +231,7 @@ function Compile-Tests
   &$uenv.VisualStudio.MsBuild "$src\Umbraco.Tests\Umbraco.Tests.csproj" `
     /p:WarningLevel=0 `
     /p:Configuration=$buildConfiguration `
+    /p:Platform=AnyCPU `
     /p:UseWPP_CopyWebApplication=True `
     /p:PipelineDependsOnBuild=False `
     /p:OutDir=$out\\ `
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config
index a6104af9ae..13da9246b7 100644
--- a/src/Umbraco.Web.UI/config/trees.config
+++ b/src/Umbraco.Web.UI/config/trees.config
@@ -41,5 +41,4 @@
   <add initialize="true" sortOrder="0" alias="form" application="forms" title="Forms" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormTreeController, Umbraco.Forms.Web" />
   <add initialize="true" sortOrder="3" alias="prevaluesource" application="forms" title="Prevalue sources" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.PreValueSourceTreeController, Umbraco.Forms.Web" />
   <add initialize="true" sortOrder="3" alias="formsecurity" application="users" title="Forms Security" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.FormSecurityTreeController, Umbraco.Forms.Web" />
-  <add initialize="false" sortOrder="0" alias="emailTemplates" application="forms" title="Email Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Forms.Web.Trees.EmailTemplateTreeController, Umbraco.Forms.Web" />
 </trees>
\ No newline at end of file