Make submodules portable