diff --git a/.travis.yml b/.travis.yml
index e4b861349f..b56d691289 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ matrix:
       env: export NODE_VERSION="5.8" TARGET_ARCH="ia32"
       sudo: required
     - os: linux
-      env: export NODE_VERSION="6.2" TARGET_ARCH="ia32"
+      env: export NODE_VERSION="6.3" TARGET_ARCH="ia32"
       sudo: required
 
 git:
diff --git a/appveyor.yml b/appveyor.yml
index 8fc6cd2566..a0c773a5bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ environment:
     - nodejs_version: "0.12"
     - nodejs_version: "4.1"
     - nodejs_version: "5.8"
-    - nodejs_version: "6.2"
+    - nodejs_version: "6.3"
 
 matrix:
   fast_finish: true
diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp
index dbc60874ae..07ec897d5f 100644
--- a/generate/templates/templates/binding.gyp
+++ b/generate/templates/templates/binding.gyp
@@ -8,7 +8,8 @@
       ],
 
       "variables": {
-        "coverage%": 0
+        "coverage%": 0,
+        'use_openssl_def': 0
       },
 
       "sources": [
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
index e763d6814a..a1931f8822 100644
--- a/vendor/libgit2.gyp
+++ b/vendor/libgit2.gyp
@@ -7,7 +7,8 @@
     "library%": "static_library",
     "openssl_enable_asm%": 0, # only supported with the Visual Studio 2012 (VC11) toolchain.
     "gcc_version%": 0,
-    "is_clang%": 0
+    "is_clang%": 0,
+    "use_openssl_def": 0 
   },
   "targets": [
     {
diff --git a/vendor/libssh2/win32/libssh2_config.h b/vendor/libssh2/win32/libssh2_config.h
index 4e2ae290fc..44728bb128 100644
--- a/vendor/libssh2/win32/libssh2_config.h
+++ b/vendor/libssh2/win32/libssh2_config.h
@@ -23,6 +23,7 @@
 #define HAVE_SELECT
 
 #ifdef _MSC_VER
+#if _MSC_VER < 1900
 #define snprintf _snprintf
 #if _MSC_VER < 1500
 #define vsnprintf _vsnprintf
@@ -33,10 +34,10 @@
 #else
 #define strncasecmp strnicmp
 #define strcasecmp stricmp
+#endif
 #endif /* _MSC_VER */
 
 /* Enable newer diffie-hellman-group-exchange-sha1 syntax */
 #define LIBSSH2_DH_GEX_NEW 1
 
 #endif /* LIBSSH2_CONFIG_H */
-