Fixes some XCode 6 Beta issues