Update
Misc changes from Mac