final fixes for dms