Minor fixes in submodules

See diff