fixing SAFARI issues