Adaptation for xcode6 beta4