Fixes in submodules