Some more consistency to dso