Fixes for tools projects on xcode
Merge pull request #1488 from seanpaultaylor/next

Fixes for tools projects on xcode