diff --git a/common/content/autocommands.js b/common/content/autocommands.js
index d97210b8..12c321c9 100644
--- a/common/content/autocommands.js
+++ b/common/content/autocommands.js
@@ -148,7 +148,7 @@ var AutoCommands = Module("autocommands", {
                     let validEvents = Object.keys(config.autocommands);
                     validEvents.push("*");
 
-                    events = event.split(",");
+                    events = Option.parse.stringlist(event);
                     dactyl.assert(events.every(function (event) validEvents.indexOf(event) >= 0),
                         "E216: No such group or event: " + event);
                 }
@@ -180,6 +180,7 @@ var AutoCommands = Module("autocommands", {
                         return args["-javascript"] ? completion.javascript(context) : completion.ex(context);
                 },
                 hereDoc: true,
+                keepQuotes: true,
                 literal: 2,
                 options: [
                     {
diff --git a/common/content/buffer.js b/common/content/buffer.js
index 85de3ecd..d76c6045 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -221,7 +221,7 @@ var Buffer = Module("buffer", {
 
     onDOMContentLoaded: function onDOMContentLoaded(event) {
         let doc = event.originalTarget;
-        if (doc instanceof HTMLDocument && !doc.defaultView.frameElement)
+        if (doc instanceof HTMLDocument)
             this._triggerLoadAutocmd("DOMLoad", doc);
     },