diff --git a/native/org.eclipse.cdt.native.serial/jni/win32/serial/.gitignore b/native/org.eclipse.cdt.native.serial/jni/win32/serial/.gitignore
index 8f10bd00b58..0d33d69ae64 100644
--- a/native/org.eclipse.cdt.native.serial/jni/win32/serial/.gitignore
+++ b/native/org.eclipse.cdt.native.serial/jni/win32/serial/.gitignore
@@ -4,3 +4,4 @@
 /serial.opensdf
 /serial.sdf
 /serial.v12.suo
+/.vs/
diff --git a/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.cpp b/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.cpp
index 6bbc8c4d68a..0f82d72b8d7 100644
--- a/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.cpp
+++ b/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.cpp
@@ -89,7 +89,10 @@ JNIEXPORT jlong JNICALL FUNC(open0)(JNIEnv *env, jobject jobj, jstring portName,
 extern "C"
 JNIEXPORT void JNICALL FUNC(close0)(JNIEnv *env, jobject jobj, jlong handle)
 {
+	CancelIoEx((HANDLE)handle, NULL);
 	CloseHandle((HANDLE)handle);
+	// Some drivers need us to delay a bit to make sure ports closed
+	Sleep(1000);
 }
 
 extern "C"
diff --git a/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.vcxproj b/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.vcxproj
index 4009c5fec7e..a3cd7a4c59c 100644
--- a/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.vcxproj
+++ b/native/org.eclipse.cdt.native.serial/jni/win32/serial/serial.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore b/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore
index 141e13b4a72..a79ec75379c 100644
--- a/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore
+++ b/native/org.eclipse.cdt.native.serial/os/win32/x86/.gitignore
@@ -1,3 +1,5 @@
 /serial.exp
 /serial.lib
 /serial.pdb
+/serial.iobj
+/serial.ipdb
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll
index 3ac1554c02b..8b9b4a7e7c0 100644
Binary files a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll and b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll differ
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore
index 141e13b4a72..a79ec75379c 100644
--- a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore
+++ b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/.gitignore
@@ -1,3 +1,5 @@
 /serial.exp
 /serial.lib
 /serial.pdb
+/serial.iobj
+/serial.ipdb
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll
index 331384f0a7b..cfd5033a2f4 100644
Binary files a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll and b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll differ