diff --git a/LR35902/src/LR35902.vcxproj b/LR35902/src/LR35902.vcxproj
index ac9825d..d97bb84 100644
--- a/LR35902/src/LR35902.vcxproj
+++ b/LR35902/src/LR35902.vcxproj
@@ -22,7 +22,6 @@
     <ProjectGuid>{7730ECF5-8206-4ECB-BA6B-6B5CFE50CFB2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>LR35902</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/M6502/src/M6502.vcxproj b/M6502/src/M6502.vcxproj
index c242e01..3dec772 100644
--- a/M6502/src/M6502.vcxproj
+++ b/M6502/src/M6502.vcxproj
@@ -23,7 +23,6 @@
     <ProjectGuid>{D8726A1B-BBFE-47EF-9860-26B90140BA66}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>M6502</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -90,6 +89,8 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/M6502/test_M6502/test_M6502.vcxproj b/M6502/test_M6502/test_M6502.vcxproj
index 1d9fee7..25f43c2 100644
--- a/M6502/test_M6502/test_M6502.vcxproj
+++ b/M6502/test_M6502/test_M6502.vcxproj
@@ -70,9 +70,9 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
     <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
     <LibraryPath>C:\local\boost_1_64_0\lib64-msvc-14.0;$(LibraryPath)</LibraryPath>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
@@ -97,12 +97,15 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <StackReserveSize>10000000</StackReserveSize>
+      <Profile>true</Profile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -141,6 +144,7 @@
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <Profile>true</Profile>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/Z80/fusetest_Z80/fusetest_Z80.vcxproj b/Z80/fusetest_Z80/fusetest_Z80.vcxproj
index 880f56e..d3f5c7c 100644
--- a/Z80/fusetest_Z80/fusetest_Z80.vcxproj
+++ b/Z80/fusetest_Z80/fusetest_Z80.vcxproj
@@ -24,7 +24,6 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>fuse_test_Z80</RootNamespace>
     <ProjectName>fusetest_Z80</ProjectName>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/Z80/src/Z80.vcxproj b/Z80/src/Z80.vcxproj
index f43ea30..3fb7c70 100644
--- a/Z80/src/Z80.vcxproj
+++ b/Z80/src/Z80.vcxproj
@@ -23,7 +23,6 @@
     <ProjectGuid>{01974F81-2750-45AF-B845-2C903A54A334}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Z80</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/Z80/test/test_Z80.vcxproj b/Z80/test/test_Z80.vcxproj
index c215a2b..f61a03a 100644
--- a/Z80/test/test_Z80.vcxproj
+++ b/Z80/test/test_Z80.vcxproj
@@ -84,6 +84,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>..\inc;..\..\inc;C:\local\boost_1_64_0;$(IncludePath)</IncludePath>
     <LibraryPath>C:\local\boost_1_64_0\lib64-msvc-14.0;$(LibraryPath)</LibraryPath>
+    <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>