Xcode upgrade changes