Cross browser fixes