Fix some obvious regressions with dnd