Updates to deal with Xcode6 beta7.