Fixes/improvements to dm submodules.