Minor tweaks to help with DMS development