Getting submodules working in all cases