Preparing for upgrade to latest Xcode and iOS 6