BF/DnD bugs fix

some change to DnD