diff --git a/cryptdll.vcxproj b/cryptdll.vcxproj
index 799f2072..9a1837fe 100644
--- a/cryptdll.vcxproj
+++ b/cryptdll.vcxproj
@@ -115,6 +115,7 @@
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
 
diff --git a/cryptlib.vcxproj b/cryptlib.vcxproj
index 977c2bdc..2fd49175 100644
--- a/cryptlib.vcxproj
+++ b/cryptlib.vcxproj
@@ -88,14 +88,6 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
-    <Link>
-      <ErrorReporting>NoErrorReport</ErrorReporting>
-      <AdditionalDependencies>cryptlib.lib;Ws2_32.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories />
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)\cryptlib.pdb</ProgramDatabaseFile>
-      <OutputFile>$(OutDir)\cryptlib.lib</OutputFile>
-    </Link>
   </ItemDefinitionGroup>
 
   <!-- Debug Configurations -->
@@ -130,10 +122,6 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
     </ResourceCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
   </ItemDefinitionGroup>
 
   <!-- DLL-Import Overrides for Preprocessor -->
@@ -153,9 +141,10 @@
     <ClCompile>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
-    <Link>
+    <Lib>
       <TargetMachine>MachineX86</TargetMachine>
-    </Link>
+      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
+    </Lib>
   </ItemDefinitionGroup>
 
   <!-- X64 Configurations -->
@@ -163,9 +152,9 @@
     <ClCompile>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
-    <Link>
+    <Lib>
       <TargetMachine>MachineX64</TargetMachine>
-    </Link>
+    </Lib>
   </ItemDefinitionGroup>
 
   <!-- Original File with special treatment -->
diff --git a/dlltest.vcxproj b/dlltest.vcxproj
index 313329bb..66b075ec 100644
--- a/dlltest.vcxproj
+++ b/dlltest.vcxproj
@@ -59,7 +59,6 @@
       <AdditionalDependencies>cryptopp.lib;Ws2_32.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(Platform)\DLL_Output\$(Configuration)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
 
@@ -108,6 +107,7 @@
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>