Update mac

Another update from latest changes.