Fixed Firefox issues