diff --git a/atom/browser/api/atom_api_cookies.cc b/atom/browser/api/atom_api_cookies.cc
index be11df8888c5..27abfcc65f58 100644
--- a/atom/browser/api/atom_api_cookies.cc
+++ b/atom/browser/api/atom_api_cookies.cc
@@ -343,7 +343,7 @@ mate::ObjectTemplateBuilder Cookies::GetObjectTemplateBuilder(
 mate::Handle<Cookies> Cookies::Create(
     v8::Isolate* isolate,
     content::BrowserContext* browser_context) {
-  return CreateHandle(isolate, new Cookies(browser_context));
+  return mate::CreateHandle(isolate, new Cookies(browser_context));
 }
 
 }  // namespace api
diff --git a/atom/browser/api/atom_api_protocol.cc b/atom/browser/api/atom_api_protocol.cc
index bb937905004c..0b7a5cfa7c34 100644
--- a/atom/browser/api/atom_api_protocol.cc
+++ b/atom/browser/api/atom_api_protocol.cc
@@ -354,7 +354,7 @@ void Protocol::EmitEventInUI(const std::string& event,
 // static
 mate::Handle<Protocol> Protocol::Create(
     v8::Isolate* isolate, AtomBrowserContext* browser_context) {
-  return CreateHandle(isolate, new Protocol(browser_context));
+  return mate::CreateHandle(isolate, new Protocol(browser_context));
 }
 
 }  // namespace api
diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc
index 744accd7d1cd..18806ebf41f3 100644
--- a/atom/browser/api/atom_api_session.cc
+++ b/atom/browser/api/atom_api_session.cc
@@ -41,7 +41,7 @@ mate::ObjectTemplateBuilder Session::GetObjectTemplateBuilder(
 mate::Handle<Session> Session::Create(
     v8::Isolate* isolate,
     content::BrowserContext* browser_context) {
-  return CreateHandle(isolate, new Session(browser_context));
+  return mate::CreateHandle(isolate, new Session(browser_context));
 }
 
 }  // namespace api
diff --git a/common.gypi b/common.gypi
index 14b89393a534..8ecf77e58bf9 100644
--- a/common.gypi
+++ b/common.gypi
@@ -38,15 +38,16 @@
     'target_conditions': [
       ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', {
         'msvs_disabled_warnings': [
-          4703,  # potentially uninitialized local pointer variable 'req' used
           4013,  # 'free' undefined; assuming extern returning int
           4018,  # signed/unsigned mismatch
           4054,  #
+          4055,  # 'type cast' : from data pointer 'void *' to function pointer
           4057,  # 'function' : 'volatile LONG *' differs in indirection to slightly different base types from 'unsigned long *'
           4189,  #
           4131,  # uses old-style declarator
           4133,  # incompatible types
           4146,  # unary minus operator applied to unsigned type, result still unsigned
+          4164,  # intrinsic function not declared
           4152,  # function/data pointer conversion in expression
           4206,  # translation unit is empty
           4204,  # non-constant aggregate initializer
@@ -58,6 +59,7 @@
           4389,  # '==' : signed/unsigned mismatch
           4505,  # unreferenced local function has been removed
           4701,  # potentially uninitialized local variable 'sizew' used
+          4703,  # potentially uninitialized local pointer variable 'req' used
           4706,  # assignment within conditional expression
           4804,  # unsafe use of type 'bool' in operation
           4996,  # this function or variable may be unsafe.
diff --git a/script/upload.py b/script/upload.py
index 281300554ef3..931eb92f7e06 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -85,10 +85,6 @@ def main():
                       os.path.join(DIST_DIR, MKSNAPSHOT_NAME))
 
   if PLATFORM == 'win32':
-    # Upload PDBs to Windows symbol server.
-    execute([sys.executable,
-             os.path.join(SOURCE_ROOT, 'script', 'upload-windows-pdb.py')])
-
     # Upload node headers.
     execute([sys.executable,
              os.path.join(SOURCE_ROOT, 'script', 'upload-node-headers.py'),