Small fixes
Updated submodules