Fix some items in des module that didn't get changed as they should have as part of #365 and #380
Merge branch 'master' into #325