Fixups for Firefox