Adapt to recent XCode