Added Firefox fixes