Small tweaks for latest Xcode and iOS versions.