diff --git a/binary/chrome.manifest b/binary/chrome.manifest
index 06608a6f..57abad73 100644
--- a/binary/chrome.manifest
+++ b/binary/chrome.manifest
@@ -1,18 +1,18 @@
 
-interraces components/6.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 appversion>=6.0 appversion<6.*
-interraces components/7.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 appversion>=7.0 appversion<7.*
-interraces components/8.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 platformversion>=8.0 platformversion<8.*
-interraces components/9.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 platformversion>=9.0 platformversion<9.*
+interfaces components/6.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 appversion>=6.0 appversion<6.*
+interfaces components/7.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 appversion>=7.0 appversion<7.*
+interfaces components/8.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 platformversion>=8.0 platformversion<8.*
+interfaces components/9.0-Linux_x86_64-gcc3/dactylIUtils.xpt abi=Linux_x86_64-gcc3 platformversion>=9.0 platformversion<9.*
 
-interraces components/6.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 appversion>=6.0 appversion<6.*
-interraces components/7.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 appversion>=7.0 appversion<7.*
-interraces components/8.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 platformversion>=8.0 platformversion<8.*
-interraces components/9.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 platformversion>=9.0 platformversion<9.*
+interfaces components/6.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 appversion>=6.0 appversion<6.*
+interfaces components/7.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 appversion>=7.0 appversion<7.*
+interfaces components/8.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 platformversion>=8.0 platformversion<8.*
+interfaces components/9.0-Darwin_x86_64-gcc3/dactylIUtils.xpt abi=Darwin_x86_64-gcc3 platformversion>=9.0 platformversion<9.*
 
-interraces components/6.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc appversion>=6.0 appversion<6.*
-interraces components/7.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc appversion>=7.0 appversion<7.*
-interraces components/8.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc platformversion>=8.0 platformversion<8.*
-interraces components/9.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc platformversion>=9.0 platformversion<9.*
+interfaces components/6.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc appversion>=6.0 appversion<6.*
+interfaces components/7.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc appversion>=7.0 appversion<7.*
+interfaces components/8.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc platformversion>=8.0 platformversion<8.*
+interfaces components/9.0-WINNT_x86-msvc/dactylIUtils.xpt abi=WINNT_x86-msvc platformversion>=9.0 platformversion<9.*
 
 binary-component components/6.0-Linux_x86_64-gcc3/dactyl.so abi=Linux_x86_64-gcc3 appversion>=6.0 appversion<6.*
 binary-component components/7.0-Linux_x86_64-gcc3/dactyl.so abi=Linux_x86_64-gcc3 appversion>=7.0 appversion<7.*
diff --git a/binary/install.rdf b/binary/install.rdf
index 1014f472..cf1f8c34 100644
--- a/binary/install.rdf
+++ b/binary/install.rdf
@@ -16,6 +16,13 @@
                 em:maxVersion="9.*"/>
         </em:targetApplication>
 
+        <em:targetApplication>
+            <Description
+                em:id="toolkit@mozilla.org"
+                em:minVersion="4.0"
+                em:maxVersion="9.*"/>
+        </em:targetApplication>
+
         <em:targetApplication>
             <Description
                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
diff --git a/binary/src/Makefile b/binary/src/Makefile
index 7466ed3e..bf22ef35 100644
--- a/binary/src/Makefile
+++ b/binary/src/Makefile
@@ -1,6 +1,6 @@
 ROOT = ..
 
-XPTDIR          = $(ROOT)/components/
+XPTDIR          = $(ROOT)/components/$(ABI)/
 SODIR           = $(ROOT)/components/$(ABI)/
 OBJDIR          = $(ABI)/
 
@@ -87,7 +87,7 @@ $(MODULE).so: $(OBJS)
 $(MODULE).dll: $(OBJS)
 	$(LINK)$@ $(GECKO_LDFLAGS) $(OBJS)
 
-$(XPTDIR) $(SODIR) $(OBJDIR):
+$(sort $(XPTDIR) $(SODIR) $(OBJDIR)):
 	mkdir -p $@
 .PHONY: module xpts build clean all depend
 
diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm
index 71ae68bb..af3e5b07 100644
--- a/common/modules/finder.jsm
+++ b/common/modules/finder.jsm
@@ -331,7 +331,6 @@ var RangeFinder = Module("rangefinder", {
  */
 var RangeFind = Class("RangeFind", {
     init: function init(window, matchCase, backward, elementPath, regexp) {
-        util.dumpStack("init " + backward);
         this.window = Cu.getWeakReference(window);
         this.content = window.content;
 
@@ -628,6 +627,7 @@ var RangeFind = Class("RangeFind", {
 
         if (this.regexp)
             try {
+                var flags = this.matchCase ? "" : "i";
                 RegExp(pattern);
             }
             catch (e) {
@@ -658,11 +658,11 @@ var RangeFind = Class("RangeFind", {
                     range = DOM.stringify(range);
 
                     if (!this.backward)
-                        var match = RegExp(pattern, "m").exec(range);
+                        var match = RegExp(pattern, "m" + flags).exec(range);
                     else {
-                        match = RegExp("[^]*(?:" + pattern + ")", "m").exec(range);
+                        match = RegExp("[^]*(?:" + pattern + ")", "m" + flags).exec(range);
                         if (match)
-                            match = RegExp(pattern + "$").exec(match[0]);
+                            match = RegExp(pattern + "$", flags).exec(match[0]);
                     }
                     if (!(match && match[0]))
                         continue;