Xcode6b3 fixes