Tweak DSOM based on feedback from @avdi.