More Mac changes.