Mac updates
Merged