Firefox fixes
Safari fixes