diff --git a/Source/Tools/Flax.Build/Build/Target.cs b/Source/Tools/Flax.Build/Build/Target.cs
index bc56254b6..90523b5ef 100644
--- a/Source/Tools/Flax.Build/Build/Target.cs
+++ b/Source/Tools/Flax.Build/Build/Target.cs
@@ -281,10 +281,10 @@ namespace Flax.Build
                 options.CompileEnv.IntrinsicFunctions = true;
                 options.CompileEnv.BufferSecurityCheck = true;
                 options.CompileEnv.Inlining = true;
-                options.CompileEnv.WholeProgramOptimization = true;
+                options.CompileEnv.WholeProgramOptimization = false;
 
                 options.LinkEnv.DebugInformation = true;
-                options.LinkEnv.LinkTimeCodeGeneration = true;
+                options.LinkEnv.LinkTimeCodeGeneration = false;
                 options.LinkEnv.UseIncrementalLinking = true;
                 options.LinkEnv.Optimization = true;
                 break;
diff --git a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
index 3693595ea..252d9134d 100644
--- a/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
+++ b/Source/Tools/Flax.Build/Platforms/Windows/WindowsToolchainBase.cs
@@ -526,6 +526,12 @@ namespace Flax.Build.Platforms
                         // Whole Program Optimization
                         commonArgs.Add("/GL");
                     }
+                    else
+                    {
+                        // Enable SEE2 and other code optimizations but without breaking incremental linking
+                        //commonArgs.Add("/Og"); // Results in D9035 warning
+                        commonArgs.Add("/O2");
+                    }
                 }
                 else
                 {