More xcode 6 beta 5 fixes.