Attempt to fix Safari problems