Fix issues related to newest Xcode.