diff --git a/common/content/buffer.js b/common/content/buffer.js
index 49a795ee..91185e49 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -161,7 +161,7 @@ var Buffer = Module("buffer", {
 
     getDefaultNames: function getDefaultNames(node) {
         let url = node.href || node.src || node.documentURI;
-        let currExt = url.replace(/.*(?:\.([a-z0-9]+))?$/, "$1").toLowerCase();
+        let currExt = url.replace(/^.*?(?:\.([a-z0-9]+))?$/i, "$1").toLowerCase();
 
         if (isinstance(node, [Document, HTMLImageElement])) {
             let type = node.contentType || node.QueryInterface(Ci.nsIImageLoadingContent)
@@ -173,7 +173,7 @@ var Buffer = Module("buffer", {
             ext = "." + currExt;
         else
             ext = "";
-        let re = ext ? RegExp("(\\." + currExt + ")?$") : /$/;
+        let re = ext ? RegExp("(\\." + currExt + ")?$", "i") : /$/;
 
         var names = [];
         if (node.title)
diff --git a/pentadactyl/content/disable-acr.jsm b/pentadactyl/content/disable-acr.jsm
index 7b83a093..943585f7 100644
--- a/pentadactyl/content/disable-acr.jsm
+++ b/pentadactyl/content/disable-acr.jsm
@@ -32,7 +32,8 @@ function checkPopup(event) {
         let elem = doc.getAnonymousElementByAttribute(binding, "anonid", "stillworks");
         if (elem && elem.nextSibling) {
             elem.nextSibling.disabled = true;
-            elem.nextSibling.setAttribute("tooltiptext", "Developer has opted out of incompatibility reports");
+            elem.nextSibling.setAttribute("tooltiptext", "Developer has opted out of incompatibility reports\n"+
+                                                         "Development versions are available with updated support");
         }
     }
 }