Fixed Firefox messageing