Various fixes.
More submodules.