Fixed some issues with my submodules