fixes for building in Xcode 6 beta 7