diff --git a/src/node_file_source.hpp b/src/node_file_source.hpp
index 49ff27e14..a56c0f7c0 100644
--- a/src/node_file_source.hpp
+++ b/src/node_file_source.hpp
@@ -11,6 +11,7 @@
 #pragma GCC diagnostic pop
 
 #include <map>
+#include <memory>
 
 namespace node_mbgl {
 
diff --git a/src/node_map.cpp b/src/node_map.cpp
index 3ebed2e20..4dc39b729 100644
--- a/src/node_map.cpp
+++ b/src/node_map.cpp
@@ -38,7 +38,6 @@ void NodeMap::Init(v8::Handle<v8::Object> target) {
     t->InstanceTemplate()->SetInternalFieldCount(1);
     t->SetClassName(NanNew("Map"));
 
-    NODE_SET_PROTOTYPE_METHOD(t, "setAccessToken", SetAccessToken);
     NODE_SET_PROTOTYPE_METHOD(t, "load", Load);
     NODE_SET_PROTOTYPE_METHOD(t, "render", Render);
 
@@ -83,27 +82,6 @@ NAN_METHOD(NodeMap::New) {
 }
 
 
-NAN_METHOD(NodeMap::SetAccessToken) {
-    NanScope();
-
-    if (args.Length() < 1) {
-        return NanThrowError("Requires a string as first argument");
-    }
-
-    NanUtf8String token(args[0]);
-
-    auto nodeMap = node::ObjectWrap::Unwrap<NodeMap>(args.Holder());
-
-    try {
-        nodeMap->map.setAccessToken(std::string { *token, size_t(token.length()) });
-    } catch (const std::exception &ex) {
-        return NanThrowError(ex.what());
-    }
-
-
-    NanReturnUndefined();
-}
-
 const std::string StringifyStyle(v8::Handle<v8::Value> styleHandle) {
     NanScope();
 
@@ -125,8 +103,7 @@ NAN_METHOD(NodeMap::Load) {
     if (args[0]->IsObject()) {
         style = StringifyStyle(args[0]);
     } else if (args[0]->IsString()) {
-        NanUtf8String string(args[0]);
-        style = { *string, size_t(string.length()) };
+        style = *NanUtf8String(args[0]);
     } else {
         return NanThrowTypeError("First argument must be a string or object");
     }
@@ -145,7 +122,7 @@ NAN_METHOD(NodeMap::Load) {
 std::unique_ptr<NodeMap::RenderOptions> NodeMap::ParseOptions(v8::Local<v8::Object> obj) {
     NanScope();
 
-    auto options = mbgl::util::make_unique<RenderOptions>();
+    auto options = std::make_unique<RenderOptions>();
 
     if (obj->Has(NanNew("zoom"))) { options->zoom = obj->Get(NanNew("zoom"))->NumberValue(); }
     if (obj->Has(NanNew("bearing"))) { options->bearing = obj->Get(NanNew("bearing"))->NumberValue(); }
diff --git a/src/node_map.hpp b/src/node_map.hpp
index 1cb32e40d..ecba02867 100644
--- a/src/node_map.hpp
+++ b/src/node_map.hpp
@@ -25,7 +25,6 @@ class NodeMap : public node::ObjectWrap {
 public:
     static void Init(v8::Handle<v8::Object> target);
     static NAN_METHOD(New);
-    static NAN_METHOD(SetAccessToken);
     static NAN_METHOD(Load);
     static NAN_METHOD(Render);
 
diff --git a/src/node_mapbox_gl_native.cpp b/src/node_mapbox_gl_native.cpp
index f4788802e..7a161b2ed 100644
--- a/src/node_mapbox_gl_native.cpp
+++ b/src/node_mapbox_gl_native.cpp
@@ -32,7 +32,7 @@ void RegisterModule(v8::Handle<v8::Object> exports) {
     auto EventEmitter = process->Get(NanNew("EventEmitter"))->ToObject();
     exports->SetPrototype(EventEmitter->Get(NanNew("prototype")));
 
-    mbgl::Log::setObserver(mbgl::util::make_unique<node_mbgl::NodeLogObserver>(exports));
+    mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(exports));
 }
 
 NODE_MODULE(mapbox_gl_native, RegisterModule)
diff --git a/vendor/mbgl b/vendor/mbgl
index a20b89e4f..9dd8d2672 160000
--- a/vendor/mbgl
+++ b/vendor/mbgl
@@ -1 +1 @@
-Subproject commit a20b89e4ff991b650c7b09e203c2fee5c8e0c62b
+Subproject commit 9dd8d26729eba5ecb8d788b8ba2150cf5b4bdeca