diff --git a/internal_packages/worker-ui/lib/developer-bar-store.coffee b/internal_packages/worker-ui/lib/developer-bar-store.coffee
index dad9279d4..f8cc731e4 100644
--- a/internal_packages/worker-ui/lib/developer-bar-store.coffee
+++ b/internal_packages/worker-ui/lib/developer-bar-store.coffee
@@ -7,8 +7,8 @@ moment = require 'moment'
 class DeveloperBarCurlRequest
   constructor: ({@id, request, statusCode, error}) ->
     url = request.url
-    if request.auth
-      url = url.replace('://', "://#{request.auth.user}:#{request.auth.pass}@")
+    if request.auth and (request.auth.user || request.auth.pass)
+      url = url.replace('://', "://#{request.auth.user ? ""}:#{request.auth.pass ? ""}@")
     if request.qs
       url += "?#{qs.stringify(request.qs)}"
 
@@ -23,6 +23,10 @@ class DeveloperBarCurlRequest
       for k,v of request.headers
         headers += "-H \"#{k}: #{v}\" "
 
+    if request.auth?.bearer
+      tok = request.auth.bearer.replace("!", "\\!")
+      headers += "-H \"Authorization: Bearer #{tok}\" "
+
     @command = "curl -X #{request.method} #{headers}#{data} \"#{url}\""
     @statusCode = statusCode ? error?.code ? "pending"
     @errorMessage = error?.message ? error
diff --git a/package.json b/package.json
index cfd29d39f..13ddb5241 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,6 @@
   "packageDependencies": {},
   "scripts": {
     "test": "./N1.sh --test",
-    "install-eslint-packages": "mv ./node_modules/sqlite3 ./sqlite3; npm install eslint@2.9.0 eslint-config-airbnb@8.0.0 eslint-plugin-import@1.7.0 eslint-plugin-jsx-a11y@1.0.4 eslint-plugin-react@5.0.1 babel-eslint@6.0.4; mv ./sqlite3 ./node_modules/sqlite3;"
+    "install-eslint-packages": "mv ./node_modules/sqlite3 ./sqlite3; npm install eslint@2.9.0 eslint-config-airbnb@8.0.0 eslint-plugin-import@1.7.0 eslint-plugin-jsx-a11y@1.0.4 eslint-plugin-react@5.0.1 babel-eslint@6.0.4 eslint_d@4.0.1; mv ./sqlite3 ./node_modules/sqlite3;"
   }
 }
diff --git a/src/nylas-env.coffee b/src/nylas-env.coffee
index 67027d861..723f3abd2 100644
--- a/src/nylas-env.coffee
+++ b/src/nylas-env.coffee
@@ -959,6 +959,9 @@ class NylasEnvConstructor
   onBeforeUnload: (callback) ->
     @windowEventHandler.addUnloadCallback(callback)
 
+  removeUnloadCallback: (callback) ->
+    @windowEventHandler.removeUnloadCallback(callback)
+
   enhanceEventObject: ->
     overriddenStop =  Event::stopPropagation
     Event::stopPropagation = ->
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index 91d2452fa..c320b9757 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -103,6 +103,9 @@ class WindowEventHandler
   addUnloadCallback: (callback) ->
     @unloadCallbacks.push(callback)
 
+  removeUnloadCallback: (callback) ->
+    @unloadCallbacks = @unloadCallbacks.filter (cb) -> cb isnt callback
+
   runUnloadCallbacks: ->
     hasReturned = false