diff --git a/binding.gyp b/binding.gyp
index d6a45e8..af2bd94 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -23,6 +23,7 @@
             'LIB_EXPAT=expat'
           ],
           'cflags': [
+            '-Wno-unused-result',
             '-std=gnu++0x',
             '<!@(pkg-config --cflags dbus-1)'
           ],
diff --git a/deps/libexpat/libexpat.gyp b/deps/libexpat/libexpat.gyp
index d74e868..143b52a 100644
--- a/deps/libexpat/libexpat.gyp
+++ b/deps/libexpat/libexpat.gyp
@@ -56,6 +56,8 @@
         'HAVE_EXPAT_CONFIG_H'
       ],
       'cflags': [
+        '-Wno-implicit-fallthrough',
+        '-Wno-unused-but-set-variable',
         '-Wno-missing-field-initializers'
       ],
       'xcode_settings': {
diff --git a/src/object_handler.cc b/src/object_handler.cc
index de35dda..9f31cc9 100644
--- a/src/object_handler.cc
+++ b/src/object_handler.cc
@@ -53,8 +53,9 @@ static DBusHandlerResult MessageHandler(DBusConnection* connection,
   if (!dbus_message_get_no_reply(message)) dbus_message_ref(message);
 
   // Invoke
-  Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(handler), 7,
-                    info);
+  Nan::AsyncResource asyncCB("message-handler");
+  asyncCB.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(handler), 
+                          7, info);
 
   return DBUS_HANDLER_RESULT_HANDLED;
 }
@@ -115,7 +116,7 @@ NAN_METHOD(RegisterObjectPath) {
   // Register object path
   char* object_path = strdup(*Nan::Utf8String(info[1]));
   dbus_error_init(&error);
-  dbus_bool_t ret = dbus_connection_try_register_object_path(
+  dbus_connection_try_register_object_path(
       bus->connection, object_path, &vtable, nullptr, &error);
   dbus_connection_flush(bus->connection);
   dbus_free(object_path);
diff --git a/src/signal.cc b/src/signal.cc
index 3b277fd..a042381 100644
--- a/src/signal.cc
+++ b/src/signal.cc
@@ -25,8 +25,9 @@ void DispatchSignal(Local<Value> info[]) {
   if (!hookSignal) return;
 
   //		MakeCallback(handler, handler, 6, info);
-  Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(handler), 6,
-                    info);
+  Nan::AsyncResource asyncCB("signal-handler");
+  asyncCB.runInAsyncScope(Nan::GetCurrentContext()->Global(), Nan::New(handler), 
+                          6, info);
 }
 
 NAN_METHOD(SetSignalHandler) {