DM commit + fixes