diff --git a/common/content/find.js b/common/content/find.js
index 1e31c3b3..02468f5f 100644
--- a/common/content/find.js
+++ b/common/content/find.js
@@ -345,7 +345,7 @@ function Search() //{{{
             found = fastFind.find(searchString, linksOnly) != Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND;
 
             if (!found)
-                setTimeout(function () commandline.error = "E486: Pattern not found: " + searchPattern, 0);
+                setTimeout(function () liberator.echoerr("E486: Pattern not found: " + searchPattern, commandline.FORCE_SINGLELINE), 0);
 
             return found;
         },
@@ -364,7 +364,7 @@ function Search() //{{{
 
             if (result == Components.interfaces.nsITypeAheadFind.FIND_NOTFOUND)
             {
-                commandline.error = "E486: Pattern not found: " + lastSearchPattern;
+                liberator.echoerr("E486: Pattern not found: " + lastSearchPattern, commandline.FORCE_SINGLELINE);
             }
             else if (result == Components.interfaces.nsITypeAheadFind.FIND_WRAPPED)
             {
@@ -381,7 +381,7 @@ function Search() //{{{
             }
             else
             {
-                commandline.status = (up ? "?" : "/") + lastSearchPattern;
+                commandline.echo((up ? "?" : "/") + lastSearchPattern, null, commandline.FORCE_SINGLELINE);
 
                 if (options["hlsearch"])
                     this.highlight(lastSearchString);
diff --git a/common/content/io.js b/common/content/io.js
index e63b3849..adc8f46e 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -526,12 +526,12 @@ function IO() //{{{
         {
             let file = Components.classes["@mozilla.org/file/local;1"]
                                  .createInstance(Components.interfaces.nsILocalFile);
-            let protocolHandler = Components.classes["@mozilla.org/network/protocol;1?name=file"]
-                                            .createInstance(Components.interfaces.nsIFileProtocolHandler);
 
             if (/file:\/\//.test(path))
             {
-                file = protocolHandler.getFileFromURLSpec(path);
+                file = Components.classes["@mozilla.org/network/protocol;1?name=file"]
+                                 .createInstance(Components.interfaces.nsIFileProtocolHandler)
+                                 .getFileFromURLSpec(path);
             }
             else
             {
diff --git a/common/content/ui.js b/common/content/ui.js
index 0ad66838..bfe6263f 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -954,30 +954,6 @@ function CommandLine() //{{{
             commandlineWidget.collapsed = true;
         },
 
-        get error()
-        {
-            if (lastEcho != messageBox.value && messageBox.getAttributeNS(NS.uri, "highlight") == this.HL_ERRORMSG)
-                return messageBox.value;
-            return null;
-        },
-        set error(status)
-        {
-            lastEcho = null;
-            echoLine(status, this.HL_ERRORMSG, true);
-        },
-
-        get status()
-        {
-            if (lastEcho != messageBox.value && messageBox.getAttributeNS(NS.uri, "highlight") == this.HL_NORMAL)
-                return messageBox.value;
-            return null;
-        },
-        set status(status)
-        {
-            lastEcho = null;
-            echoLine(status, this.HL_NORMAL, true);
-        },
-
         // liberator.echo uses different order of flags as it omits the hightlight group, change v.commandline.echo argument order? --mst
         echo: function echo(str, highlightGroup, flags)
         {
diff --git a/common/content/util.js b/common/content/util.js
index 104fa9ca..24456594 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -167,7 +167,7 @@ const util = { //{{{
         clipboardHelper.copyString(str);
 
         if (verbose)
-            commandline.status = "Yanked " + str;
+            liberator.echo("Yanked " + str, commandline.FORCE_SINGLELINE);
     },
 
     createURI: function createURI(str)