Some Mac build fixes from vit9696 and some more. Update submodules.