diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
index c72329cba..eae56e0a4 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
@@ -275,11 +275,20 @@ namespace Flax.Build
             args.Add("/unsafe");
             args.Add("/fullpaths");
             args.Add("/filealign:512");
+#if USE_NETCORE
             args.Add("/langversion:latest");
+            args.Add("-nowarn:8632"); // Nullable
+#else
+            args.Add("/langversion:7.3");
+#endif
             if (buildOptions.ScriptingAPI.IgnoreMissingDocumentationWarnings)
                 args.Add("-nowarn:1591");
-            args.Add("-nowarn:8632"); // nullable
+#if USE_NETCORE
+            // Optimizations prevent debugging, only enable in release builds
+            args.Add(buildData.Configuration == TargetConfiguration.Release ? "/optimize+" : "/optimize-");
+#else
             args.Add(buildData.Configuration == TargetConfiguration.Debug ? "/optimize-" : "/optimize+");
+#endif
             args.Add(string.Format("/out:\"{0}\"", outputFile));
             args.Add(string.Format("/doc:\"{0}\"", outputDocFile));
             if (buildOptions.ScriptingAPI.Defines.Count != 0)
@@ -291,8 +300,10 @@ namespace Flax.Build
                 args.Add(string.Format("/reference:\"{0}{1}.dll\"", referenceAssemblies, reference));
             foreach (var reference in fileReferences)
                 args.Add(string.Format("/reference:\"{0}\"", reference));
+#if USE_NETCORE
             foreach (var analyzer in buildOptions.ScriptingAPI.SystemAnalyzers)
                 args.Add(string.Format("/analyzer:\"{0}{1}.dll\"", referenceAnalyzers, analyzer));
+#endif
             foreach (var sourceFile in sourceFiles)
                 args.Add("\"" + sourceFile + "\"");
 
@@ -320,8 +331,13 @@ namespace Flax.Build
                 // The "/shared" flag enables the compiler server support:
                 // https://github.com/dotnet/roslyn/blob/main/docs/compilers/Compiler%20Server.md
 
+#if USE_NETCORE
                 task.CommandPath = "dotnet";
                 task.CommandArguments = $"exec \"{cscPath}\" /noconfig /shared @\"{responseFile}\"";
+#else
+                task.CommandPath = cscPath;
+                task.CommandArguments = $"/noconfig /shared @\"{responseFile}\"";
+#endif
             }
 
             BuildDotNetAssembly?.Invoke(graph, buildData, buildOptions, task, binaryModule);
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
index c803ef8e7..f864d2778 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
@@ -148,7 +148,7 @@ namespace Flax.Build.Projects.VisualStudio
                 csProjectFileContent.AppendLine(string.Format("  <PropertyGroup Condition=\"'$(Configuration)|$(Platform)' == '{0}' or '$(Configuration)|$(Platform)' == '{1}'\">", configuration.Name, configuration.Name.Replace(configuration.ArchitectureName, "AnyCPU")));
                 csProjectFileContent.AppendLine("    <DebugSymbols>true</DebugSymbols>");
                 csProjectFileContent.AppendLine("    <DebugType>portable</DebugType>");
-                csProjectFileContent.AppendLine(string.Format("    <Optimize>{0}</Optimize>", configuration.Configuration == TargetConfiguration.Debug ? "false" : "true"));
+                csProjectFileContent.AppendLine(string.Format("    <Optimize>{0}</Optimize>", configuration.Configuration == TargetConfiguration.Release ? "true" : "false"));
                 csProjectFileContent.AppendLine(string.Format("    <OutputPath>{0}\\</OutputPath>", outputPath));
                 csProjectFileContent.AppendLine(string.Format("    <BaseIntermediateOutputPath>{0}\\</BaseIntermediateOutputPath>", intermediateOutputPath));
                 csProjectFileContent.AppendLine(string.Format("    <IntermediateOutputPath>{0}\\</IntermediateOutputPath>", intermediateOutputPath));
@@ -164,6 +164,7 @@ namespace Flax.Build.Projects.VisualStudio
             }
 
             // Nuget Package References
+            // TODO: Support custom Nuget package references
             csProjectFileContent.AppendLine("  <ItemGroup>");
             csProjectFileContent.AppendLine("    <PackageReference Include=\"DotNetZip\" Version=\"1.16\" />");
             csProjectFileContent.AppendLine("    <PackageReference Include=\"Microsoft.CodeAnalysis.CSharp\" Version=\"4.3\" />");