Tweaks for compatibility with new version of Xcode