Bugfixes for Dialogs (2)