fixes for Xcode6 beta 6