diff --git a/common/content/commandline.js b/common/content/commandline.js
index 9c901c4c..5685c9da 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -651,8 +651,9 @@ var CommandLine = Module("commandline", {
         XML.ignoreWhitespace = false;
         XML.prettyPrinting = false;
         if (this.command)
-            this.echo(<>:{this.command}</>, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
-        this.echo(xml, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
+            this.echo(<>:{this.command}{xml}</>, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
+        else
+            this.echo(xml, this.HIGHLIGHT_NORMAL, this.FORCE_MULTILINE);
         this.command = null;
     },
 
diff --git a/common/content/events.js b/common/content/events.js
index 119cbe9f..bd28b11a 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -62,6 +62,7 @@ var ProcessorStack = Class("ProcessorStack", {
                                 callable(result) ? result.toSource().substr(0, 50) : result),
 
     execute: function execute(result, force) {
+        events.dbg("EXECUTE " + this._result(result) + " " + force + " " + this.events.length + " " + this.processors.length);
         let processors = this.processors;
         let length = 1;
 
@@ -1600,7 +1601,7 @@ var Events = Module("events", {
             },
             { arg: true, count: true });
 
-        mappings.add([modes.MAIN],
+        mappings.add([modes.COMMAND],
             ["<A-m>s", "<sleep>"], "Sleep for {count} milliseconds before continuing macro playback",
             function ({ command, count }) {
                 let now = Date.now();
@@ -1610,7 +1611,7 @@ var Events = Module("events", {
             },
             { count: true });
 
-        mappings.add([modes.MAIN],
+        mappings.add([modes.COMMAND],
             ["<A-m>l", "<wait-for-page-load>"], "Wait for the current page to finish loading before continuing macro playback",
             function ({ count }) {
                 if (events.feedingKeys && !events.waitForPageLoad(count)) {