Fixes for tools projects on xcode