Finish resolving submodule issue.