Minor fixes submodules