Bug fixes for a couple of dialogs