diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index bbea8603a8..2320866b78 100755
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -516,7 +516,7 @@ namespace Prebuild.Core.Targets
 
                     ps.WriteLine("  </ItemGroup>");
 
-                    ps.WriteLine("  <Target Name=\"CopyFiles\">");
+                    ps.WriteLine("  <Target Name=\"CopyFiles\" AfterTargets=\"AfterBuild\">");
 
                     foreach (string destPath in project.Files.Destinations)
                     {
@@ -726,8 +726,8 @@ namespace Prebuild.Core.Targets
                         ps.WriteLine("    <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
                         ps.WriteLine("    <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
                         ps.WriteLine("    <Optimize>{0}</Optimize>", conf.Options["OptimizeCode"]);
-                        ps.WriteLine("    <TieredCompilation>false</TieredCompilation>");
-
+                        //ps.WriteLine("    <TieredCompilation>false</TieredCompilation>");
+                        ps.WriteLine("    <TieredCompilationQuickJit>false</TieredCompilationQuickJit>");
                         ps.WriteLine("    <UseCommonOutputDirectory>{0}</UseCommonOutputDirectory>", conf.Options["UseCommonOutputDirectory"].ToString());
                         ps.WriteLine("    <AppendTargetFrameworkToOutputPath>{0}</AppendTargetFrameworkToOutputPath>", conf.Options["AppendTargetFrameworkToOutputPath"].ToString());
                         ps.WriteLine("    <AppendRuntimeIdentifierToOutputPath>{0}</AppendRuntimeIdentifierToOutputPath>", conf.Options["AppendRuntimeIdentifierToOutputPath"].ToString());
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index e18c2e95cb..c2999bcefc 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -72,7 +72,7 @@ using System.Resources;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyVersion("2.0.7.*")]
+[assembly: AssemblyVersion("2.1.0.0")]
 
 //
 // Version information for an assembly consists of the following four values:
diff --git a/prebuild.xml b/prebuild.xml
index 03efe40a3b..272bdc0212 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -4,7 +4,7 @@
   <Solution activeConfig="Debug" name="OpenSim" path="./" version="0.5.0-$Rev$" frameworkVersion="net6_0">
   <Configuration name="Debug" >
       <Options>
-        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
+        <CompilerDefines>TRACE</CompilerDefines>
         <OptimizeCode>false</OptimizeCode>
         <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
         <AllowUnsafe>true</AllowUnsafe>