Bugfixes for Dialogs