Firefox functionality fixes