diff --git a/src/Makefile b/src/Makefile
index 9ab1cc3..908f59b 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,7 +51,7 @@ install_rdf := install.rdf
 
 # Version fetched from install.rdf
 VERSION := $(shell awk '/<em:version>/ {  version=$$1; \
-  version=gensub(/<em:version>(.+)<\/em:version>/, "\\1", "g", version); \
+  version=gensub(/^.*<em:version>(.+)<\/em:version>.*$$/, "\\1", "g", version); \
   print version }' $(install_rdf))
 
 # The target XPI files.
@@ -113,7 +113,7 @@ xpi_includes := $(license) \
 build_includes := $(foreach f,$(xpi_includes),$(build_dir)/$(f))
 
 
-$(xpi_built): $(build_dir) $(build_includes)
+$(xpi_built): check_version $(build_dir) $(build_includes)
 	@echo "Creating XPI file."
 	@cd $(build_dir); $(ZIP) $(xpi_file) $(xpi_includes)
 	@echo "Creating XPI file. Done!"
@@ -176,3 +176,12 @@ $(profile_locations):
 clean_build:
 	@echo "Removing build dir: $(build_dir)"
 	@rm -rf $(build_dir)
+
+# Version fetched from install.rdf
+const_file := modules/commons.js
+
+VERSION_HARD_CODED := $(shell awk -F\" '/const\W+FIRETRAY_VERSION/ \
+  { print $$2}' $(const_file))
+check_version:
+	@echo "checking version consistency"
+	@[ "$(VERSION)" == "$(VERSION_HARD_CODED)" ]
diff --git a/src/install.rdf b/src/install.rdf
index 32cb77d..295cbe7 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -19,7 +19,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>13.0</em:minVersion>
-        <em:maxVersion>15.0a1</em:maxVersion>
+        <em:maxVersion>17.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
 
@@ -61,6 +61,8 @@
     <em:contributor>Hicham.Haouari</em:contributor>
     <em:contributor>Jreybert</em:contributor>
     <em:contributor>aedrin</em:contributor>
+    <em:contributor>David Wille</em:contributor>
+    <em:contributor>Roland Tapken</em:contributor>
 
     <em:translator>Lachezar [bg-BG]</em:translator>
     <em:translator>SoftcatalàAljullu,ellibre [ca-AD]</em:translator>
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 0e7d83f..be09281 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -372,9 +372,11 @@ firetray.VersionChangeHandler = {
   },
 
   openTab: function(url) {
-    if (this.appId === FIRETRAY_THUNDERBIRD_ID)
+    log.info("appId="+firetray.Handler.appId);
+    if (firetray.Handler.appId === FIRETRAY_THUNDERBIRD_ID)
       this.openMailTab(url);
-    else if (this.appId === FIRETRAY_FIREFOX_ID || this.appId === FIRETRAY_SEAMONKEY_ID)
+    else if (firetray.Handler.appId === FIRETRAY_FIREFOX_ID ||
+             firetray.Handler.appId === FIRETRAY_SEAMONKEY_ID)
       this.openBrowserTab(url);
     else
       log.error("unsupported application");
@@ -442,6 +444,7 @@ firetray.VersionChangeHandler = {
       log.warn("mail notification type set to newmail icon.");
     }
   },
+
   correctMailServerTypes: function() {
     let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
     let serverTypes = mailAccounts["serverTypes"];
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 7a86e6c..d9cbae6 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -105,10 +105,6 @@ firetray.ChatStatusIcon = {
   // (http://sourceforge.net/tracker/index.php?func=detail&aid=3190205&group_id=35398&atid=413960)
   onFocusIn: function(widget, event, data) {
     log.debug("onFocusIn");
-    // let gdkEventFocus = ctypes.cast(event, gdk.GdkEventFocus.ptr);
-    // let gdkWin = gdkEventFocus.contents.window;
-    // let xid = firetray.Window.getXIDFromGdkWindow(gdkWin);
-    // log.debug("xid="+xid+" in="+gdkEventFocus.contents["in"]);
     firetray.Chat.stopIconBlinkingMaybe();
   }