Fixed some errors on submodules