Various improvements to DM/DS examples