Xcode 6 adaptation