Resolving further submodule issues