fixes for Xcode6-Beta6