Tweaks for #332 FF version sniffing