Fix issues with latest version of XCode.