diff --git a/common/content/autocommands.js b/common/content/autocommands.js
index 83298751..f8b10121 100644
--- a/common/content/autocommands.js
+++ b/common/content/autocommands.js
@@ -142,7 +142,7 @@ var AutoCommands = Module("autocommands", {
         dactyl.echomsg('Executing ' + event + ' Auto commands for "*"', 8);
 
         let lastPattern = null;
-        let uri = args.url ? util.newURI(args.url) : buffer.uri;
+        let uri = args.url ? util.createURI(args.url) : buffer.uri;
 
         event = event.toLowerCase();
         for (let hive in values(this.matchingHives(uri))) {
diff --git a/common/content/events.js b/common/content/events.js
index 5f0aff14..8c72d6ae 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -983,7 +983,7 @@ var Events = Module("events", {
         util.waitFor(function () !events.feedingKeys || buffer.loaded, this, maxWaitTime * 1000, true);
 
         if (!buffer.loaded)
-            dactyl.echoerr("Page did not load completely in " + maxWaitTime + " seconds. Macro stopped.");
+            dactyl.echoerr("Page did not load completely in " + maxWaitTime + " seconds.");
 
         return buffer.loaded;
     },