Updates for XCode 6