Fix Xcode-Beta6 issues