fix some dnd issues