Updates for MacOS and Xcode