More submodule fixes