more Xcode fixes
Merge pull request #3959 from ricardoquesada/xcode_fixes

more Xcode fixes