diff --git a/Orchard.proj b/Orchard.proj
index 27c19a333..73d32de78 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -63,12 +63,12 @@
     <CallTarget Targets="Gallery-Stage"/>
     <CallTarget Targets="Gallery-Setup"/>
   </Target>
-  
+
   <!-- Building -->
 
   <Target Name="Clean">
     <MSBuild Projects="$(SrcFolder)\Orchard.sln" Targets="Clean" />
-    <RemoveDir Directories="$(BuildFolder)" />
+    <RemoveDir Directories="$(BuildFolder)" ContinueOnError="true"/>
     <RemoveDir Directories="$(ArtifactsFolder)" />
   </Target>
 
@@ -123,7 +123,7 @@
 
   <Target Name="Package-Stage">
     <CallTarget Targets="CompileMsBuildTasks"/>
-    
+
     <ItemGroup>
       <SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
       <SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/>
@@ -134,8 +134,8 @@
       <Stage-Media Include="$(SrcFolder)\Orchard.Web\Media\OrchardLogo.png" />
       <Stage-PoFiles Include="$(SrcFolder)\Orchard.Web\**\*.po" />
       <Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="$(WebSitesFolder)\Orchard.Core\**\bin\**\*" />
-	  <Stage-Themes Include="$(ThemesSrcFolder)\**\*" Exclude="@(Stage-Bin-Exclude);$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\bin\**;$(ThemesSrcFolder)\obj\**;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\Properties\**" />
-	  <Stage-Themes-Binaries Include="$(ThemesSrcFolder)\*\**\bin\*" />
+      <Stage-Themes Include="$(ThemesSrcFolder)\**\*" Exclude="@(Stage-Bin-Exclude);$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\bin\**;$(ThemesSrcFolder)\obj\**;$(ThemesSrcFolder)\*.*;$(ThemesSrcFolder)\Properties\**" />
+      <Stage-Themes-Binaries Include="$(ThemesSrcFolder)\*\**\bin\*" />
 
       <Stage-Module-Exclude Include="@(Stage-Web);@(Stage-Core);@(Stage-Themes);$(WebSitesFolder)\PackageIndexReferenceImplementation\**\*"/>
 
@@ -195,11 +195,11 @@
     <XmlUpdate XmlFileName="$(StageFolder)\web.config"
       XPath="/configuration/system.web/machineKey/@validationKey"
       Value="AutoGenerate" />
-    
+
     <XmlUpdate XmlFileName="$(StageFolder)\web.config"
       XPath="/configuration/system.web/machineKey/@decryptionKey"
       Value="AutoGenerate" />
-    
+
     <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
       XPath="/system.diagnostics/trace/@autoflush"
       Value="false" />
@@ -232,7 +232,7 @@
         $(StageFolder)\**\Modules\Orchard.MultiTenancy\**;
         $(StageFolder)\**\Modules\Orchard.Search\**;
         " />
-      
+
       <MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.xml;@(MsDeploy-Exclude-Modules)" />
       <MsDeploy-Parameters Include="$(LibFolder)\msdeploy\*.xml;$(LibFolder)\msdeploy\*.sql"/>
     </ItemGroup>
@@ -289,10 +289,18 @@
 
     <Copy SourceFiles="@(Profiling-Web)" DestinationFolder="$(ProfilingFolder)\%(RecursiveDir)"/>
 
+    <XmlUpdate XmlFileName="$(ProfilingFolder)\web.config"
+      XPath="/configuration/system.web/trust/@level"
+      Value="Full" />
+
   </Target>
 
   <Target Name="Profiling-Setup">
-    <Exec Command="$(ProfilingFolder)\bin\Orchard.exe @$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt" WorkingDirectory="$(ProfilingFolder)"/>
+    <ReadLinesFromFile File="$(SrcFolder)\Orchard.Profile\profiling-setup-commands.txt">
+      <Output TaskParameter="Lines" ItemName="ProfilingSetupCommands"/>
+    </ReadLinesFromFile>
+
+    <Exec Command="$(ProfilingFolder)\bin\Orchard.exe %(ProfilingSetupCommands.Identity)" WorkingDirectory="$(ProfilingFolder)"/>
   </Target>
 
   <!-- Gallery Packaging -->
@@ -303,7 +311,6 @@
     </ItemGroup>
 
     <Copy SourceFiles="@(Gallery-Web)" DestinationFolder="$(GalleryFolder)\%(RecursiveDir)"/>
-
   </Target>
 
   <Target Name="Gallery-Setup">
@@ -321,12 +328,12 @@
     <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.MultiTenancy &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
     <Exec Command="&quot;$(GalleryFolder)\bin\Orchard.exe&quot; package create Orchard.Search &quot;$(GalleryArtifactFolder)&quot;" WorkingDirectory="$(GalleryFolder)"/>
   </Target>
-  
+
   <!-- Version -->
   <!-- Update all AssemblyInfo.cs and module.txt files to contain $(Version) -->
   <Target Name="SetVersion" Condition="$(Version) != ''">
     <CallTarget Targets="CompileMsBuildTasks"/>
-    
+
     <ItemGroup>
       <Version-AssemblyInfos Include="$(SrcFolder)\**\AssemblyInfo.cs" />
       <Version-Modules Include="$(SrcFolder)\**\Module.txt" />
@@ -338,10 +345,10 @@
         ReplacementText="${1}${2}:${3}$(Version)"
         IgnoreCase="True"/>
 
-	<FileUpdateLines Files="@(Version-Themes)"
-        Regex="^(orchardversion|version)(\s*):(\s*)(.*)"
-        ReplacementText="${1}${2}:${3}$(Version)"
-        IgnoreCase="True"/>
+    <FileUpdateLines Files="@(Version-Themes)"
+          Regex="^(orchardversion|version)(\s*):(\s*)(.*)"
+          ReplacementText="${1}${2}:${3}$(Version)"
+          IgnoreCase="True"/>
 
     <FileUpdateLines Files="@(Version-AssemblyInfos)"
         Regex="^\[assembly:(\s)*(AssemblyVersion|AssemblyFileVersion)(\s)*\(&quot;(.*)&quot;\)(\s)*\]"
diff --git a/src/Orchard.Profile/profiling-setup-commands.txt b/src/Orchard.Profile/profiling-setup-commands.txt
index 3af9e0db0..557d7e328 100644
--- a/src/Orchard.Profile/profiling-setup-commands.txt
+++ b/src/Orchard.Profile/profiling-setup-commands.txt
@@ -1 +1 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Profiling,Orchard.Framework,Routable,Common,Dashboard,Feeds,Orchard.PublishLater,HomePage,Contents,Navigation,Reports,Scheduling,Indexing,Settings,Localization,XmlRpc,Orchard.Users,Orchard.Roles,TinyMce,Orchard.Themes,Orchard.MultiTenancy,Orchard.Blogs,Orchard.Comments,Orchard.Modules,Orchard.Scripting,Orchard.Widgets,Orchard.Media,Orchard.Tags,Orchard.Experimental
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SqlCe /EnabledFeatures:Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,HomePage,Navigation,Reports,Routable,Scheduling,Settings,Shapes,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.jQuery,Orchard.Lists,Orchard.Media,Orchard.Modules,Orchard.Pages,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Widgets,TinyMce,TheThemeMachine,