fix xcode upgrade issues