More issues with the submodule system