Some changes for Safari