Fixed Firefox Issues