Dtp/merge fixes

unbreak some stuff that broke in the merge