Fixes after adding submodules