Fixed build to work with latest xcode updates