Bug fixes in submodule support.