Bugfixes for DnD