diff --git a/_build/vc/config/common.props b/_build/vc/config/common.props
index 02be8331c4..e0ba373f91 100644
--- a/_build/vc/config/common.props
+++ b/_build/vc/config/common.props
@@ -54,6 +54,8 @@
       </PrecompiledHeader>
       <ExceptionHandling>
       </ExceptionHandling>
+      <EnableEnhancedInstructionSet Condition="'$(VisualStudioVersion)' > '10.0'">NoExtensions</EnableEnhancedInstructionSet>
+      <AdditionalOptions Condition="'$(VisualStudioVersion)' >= '14.0'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;ole32.lib;uuid.lib;mpr.lib;netapi32.lib;version.lib;oleaut32.lib;wbemuuid.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -129,7 +131,6 @@
     <ClCompile Include="$(SrcRoot)plugins\common\vc_crt_fix_impl.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
       <AdditionalOptions Condition="'$(VisualStudioVersion)' == '14.0'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)' == '14.0'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ClInclude Include="*.hpp" />
     <ResourceCompile Include="*.rc" />