Fixes to dialogs