more Xcode fixes

more Xcode fixes