Fix Firefox issues