Adjust the Mac environment to match iOS
Update submodules