diff --git a/jsbot b/jsbot
index 606d0cd..139a3aa 160000
--- a/jsbot
+++ b/jsbot
@@ -1 +1 @@
-Subproject commit 606d0cdcddfda9d7328cfa0b65bb4a3079d77d9e
+Subproject commit 139a3aad5a8b5c71dfe43fdc3f04d29d8b4104df
diff --git a/modules/atheme/atheme.js b/modules/atheme/atheme.js
index f76fe3d..b315414 100644
--- a/modules/atheme/atheme.js
+++ b/modules/atheme/atheme.js
@@ -51,7 +51,7 @@ var atheme = function(dbot) {
                     });
                     delete this.hostStack[server][mask];
                 }
-            }.bind(this), 2000);
+            }.bind(this), 5000);
         }
     };
 
@@ -104,6 +104,7 @@ var atheme = function(dbot) {
                         });
                     }.bind(this), function() {
                     console.log('DONE');
+console.log(allFlags);
                         _.each(this.flagStack[event.server][end[1]].callbacks, function(callback) {
                             callback(null, this.flagStack[event.server][end[1]].flags);
                         }.bind(this));
diff --git a/modules/report/api.js b/modules/report/api.js
index 7cb78a1..e8cf9ae 100644
--- a/modules/report/api.js
+++ b/modules/report/api.js
@@ -40,7 +40,7 @@ var api = function(dbot) {
                     async.each(ops, function(op, done) {
                         dbot.api.users.isOnline(server, cName, op, function(err, user, online) {
                             if(!err && !online) offlineOps[op] = user;
-                            if(user.currentNick !== op) {
+                            if(user && user.currentNick !== op) {
                                 ops = _.without(ops, op);
                                 ops.push(user.currentNick);
                             }
diff --git a/modules/users/api.js b/modules/users/api.js
index c35878e..b9368bc 100644
--- a/modules/users/api.js
+++ b/modules/users/api.js
@@ -66,6 +66,9 @@ var api = function(dbot) {
         }
     };
 
+    api['getUserAliases'].external = true;
+    api['getUserAliases'].extMap = [ 'id', 'callback' ];
+
     return api;
 };