Fix submodule defs