Fixes for latest xcode version