fixes for xcode 6 beta 6