diff --git a/common/components/protocols.js b/common/components/protocols.js
index 8400e238..da602c2b 100644
--- a/common/components/protocols.js
+++ b/common/components/protocols.js
@@ -35,7 +35,7 @@ function makeChannel(url, orig) {
             return fakeChannel(orig);
 
         if (typeof url === "function")
-            return let ([type, data] = url()) StringChannel(data, type, orig);
+            return let ([type, data] = url(orig)) StringChannel(data, type, orig);
 
         if (isArray(url))
             return let ([type, data] = url) StringChannel(data, type, orig);
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 252c36ef..3b0677f2 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -75,7 +75,7 @@ update(Sheet.prototype, {
                                                          : "domain")
                                     + '("' + part.replace(/"/g, "%22").replace(/\*$/, "") + '")')
                               .join(", ");
-        return "/* Dactyl style #" + this.id + (this.agent ? " (agent)" : "") + " */ "
+        return "/* " + this.uri + (this.agent ? " (agent)" : "") + " */\n"
              + namespace + " @-moz-document " + selectors + "{\n" + css + "\n}\n";
     }
 });