diff --git a/common/content/hints.js b/common/content/hints.js
index fdbb2e9a..f262075f 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1240,7 +1240,7 @@ var Hints = Module("hints", {
             });
 
         options.add(["hinttags", "ht"],
-            "XPath string of hintable elements activated by 'f' and 'F'",
+            "XPath or CSS selector strings of hintable elements for hint mode",
             "stringlist", "input:not([type=hidden]),a[href],area,iframe,textarea,button,select," +
                           "[onclick],[onmouseover],[onmousedown],[onmouseup],[oncommand]," +
                           "[tabindex],[role=link],[role=button],[contenteditable=true]",
@@ -1273,9 +1273,7 @@ var Hints = Module("hints", {
             { validator: function (value) value >= 0 });
 
         options.add(["followhints", "fh"],
-            // FIXME: this description isn't very clear but I can't think of a
-            // better one right now.
-            "Change the behavior of <Return> in hint mode",
+            "Define the conditions under which selected hints are followed",
             "number", 0,
             {
                 values: {
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index f7b21148..bf45d564 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -719,7 +719,7 @@
     <type>&option.followhints.type;</type>
     <default>&option.followhints.default;</default>
     <description>
-        <p>Changes how soon matching hints are followed in Hints mode.</p>
+        <p>Define the conditions under which selected hints are followed.</p>
 
         <p>Possible values:</p>
 
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index ec3a2b2b..2871d4f3 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -1044,7 +1044,7 @@ var Completion = Module("completion", {
         };
 
         options.add(["altwildmode", "awim"],
-            "Define the behavior of the <A-Tab> key in command-line completion",
+            "Define the behavior of the c_<A-Tab> key in command-line completion",
             "stringlist", "list:full",
             wildmode);
 
@@ -1073,7 +1073,7 @@ var Completion = Module("completion", {
             });
 
         options.add(["wildmode", "wim"],
-            "Define the behavior of the <Tab> key in command-line completion",
+            "Define the behavior of the c_<Tab> key in command-line completion",
             "stringlist", "list:full",
             wildmode);
 
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 3c424e82..e8108215 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -280,7 +280,7 @@ var RangeFinder = Module("rangefinder", {
             });
 
         options.add(["incfind", "if"],
-            "Find a pattern incrementally as it is typed rather than awaiting <Return>",
+            "Find a pattern incrementally as it is typed rather than awaiting c_<Return>",
             "boolean", true);
     }
 });