Minor DDS cleanup