Bug fixes related to the update submodule