Handle cases for Xcode 6