Pull in some more submodules