Assorted tweaks to dialogs