Safari and Firefox fixes