Fixing some submodules