Fixed submodule stuff