Fixes for Xcode 6 Beta 6