diff --git a/node/SocketManager.cpp b/node/SocketManager.cpp
index 076afa074..6f4910121 100644
--- a/node/SocketManager.cpp
+++ b/node/SocketManager.cpp
@@ -245,14 +245,14 @@ SocketManager::SocketManager(
 				int bs = 1048576;
 				while (bs >= 65536) {
 					int tmpbs = bs;
-					if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&tmpbs,sizeof(tmpbs)) == 0)
+					if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 						break;
 					bs -= 16384;
 				}
 				bs = 1048576;
 				while (bs >= 65536) {
 					int tmpbs = bs;
-					if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,&tmpbs,sizeof(tmpbs)) == 0)
+					if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 						break;
 					bs -= 16384;
 				}
@@ -319,14 +319,14 @@ SocketManager::SocketManager(
 				int bs = 1048576;
 				while (bs >= 65536) {
 					int tmpbs = bs;
-					if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,&tmpbs,sizeof(tmpbs)) == 0)
+					if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 						break;
 					bs -= 16384;
 				}
 				bs = 1048576;
 				while (bs >= 65536) {
 					int tmpbs = bs;
-					if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,&tmpbs,sizeof(tmpbs)) == 0)
+					if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
 						break;
 					bs -= 16384;
 				}
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj
index 6b13a0d80..8e41be065 100644
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@@ -244,7 +244,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
       <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>