diff --git a/common/content/commandline.js b/common/content/commandline.js
index 819ec0c5..775b6d37 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -911,7 +911,7 @@ var CommandLine = Module("commandline", {
 
         modes.push(modes.COMMAND_LINE, modes.PROMPT | extra.extended,
                    update(Object.create(extra), {
-                       onKeyPress: extra.onEvent || this.closure.onKeyPress,
+                       onKeyPress: extra.onKeyPress || this.closure.onKeyPress,
                        leave: function leave(stack) {
                            commandline.leave(stack);
                            leave.supercall(extra, stack);
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 023264d6..3f521db7 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -332,7 +332,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             ([^]*?) // 1
             (?:
                 (<\{) | // 2
-                (< ((?:[a-z]-)?[a-z-]*?) >) | // 3 4
+                (< ((?:[a-z]-)?[a-z-]+?) >) | // 3 4
                 (\}>) // 5
             )
         ]]>, "giy");