Update to work with XCode 6