more submodule fixes