Some updates reflecting changes in other submodules.