Fixes for Xcode 6 beta 6