Updates for new SDK/xcode