diff --git a/common/content/modes.js b/common/content/modes.js
index 7443873d..03fa4090 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -616,7 +616,7 @@ var Modes = Module("modes", {
             function () { modes.pop(null, { fromEscape: true }); });
 
         mappings.add([modes.AUTOCOMPLETE, modes.MENU], ["<C-c>"],
-            "Leave Menu mode",
+            "Leave Autocomplete or Menu mode",
             function () { modes.pop(); });
 
         mappings.add([modes.MENU], ["<Esc>"],
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 7ad36e9c..107a479b 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -1382,7 +1382,7 @@
 </item>
 
 <item>
-    <tags>'ss' 'scrollsteps'</tags>
+    <tags>'scs' 'scrollsteps'</tags>
     <spec>'scrollsteps' 'scs'</spec>
     <type>&option.scrollsteps.type;</type>
     <default>&option.scrollsteps.default;</default>
@@ -1394,7 +1394,7 @@
     </description>
 </item>
 <item>
-    <tags>'st' 'scrolltime'</tags>
+    <tags>'sct' 'scrolltime'</tags>
     <spec>'scrolltime' 'sct'</spec>
     <type>&option.scrolltime.type;</type>
     <default>&option.scrolltime.default;</default>