More Safari fixes