diff --git a/AI/VCAI/VCAI.vcxproj b/AI/VCAI/VCAI.vcxproj
index f47938a2a..104f1bfde 100644
--- a/AI/VCAI/VCAI.vcxproj
+++ b/AI/VCAI/VCAI.vcxproj
@@ -121,6 +121,7 @@
     <Link>
       <AdditionalDependencies>VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(VCMI_Out);$(SolutionDir)\AI</AdditionalLibraryDirectories>
+      <AdditionalOptions>/d2:-notypeopt %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">
diff --git a/VCMI_global_release.props b/VCMI_global_release.props
index 96f092358..de329b5a8 100644
--- a/VCMI_global_release.props
+++ b/VCMI_global_release.props
@@ -4,7 +4,7 @@
   <PropertyGroup />
   <ItemDefinitionGroup>
     <ClCompile>
-      <Optimization>Full</Optimization>
+      <Optimization>MaxSpeed</Optimization>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj
index a33d72edf..95639854b 100644
--- a/client/VCMI_client.vcxproj
+++ b/client/VCMI_client.vcxproj
@@ -157,7 +157,7 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <OptimizeReferences>true</OptimizeReferences>
       <ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
-      <AdditionalOptions>/LTCG %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/LTCG /d2:-notypeopt %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <CustomBuildStep>
       <Command>
diff --git a/server/VCMI_server.vcxproj b/server/VCMI_server.vcxproj
index 7fcde174b..dbad8939d 100644
--- a/server/VCMI_server.vcxproj
+++ b/server/VCMI_server.vcxproj
@@ -134,6 +134,7 @@
     <Link>
       <AdditionalDependencies>VCMI_lib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(VCMI_Out)</AdditionalLibraryDirectories>
+      <AdditionalOptions>/d2:-notypeopt %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|x64'">