Some mac changes
Merged changes