Various improvements to the warning dialogs