Some fixes to popup dialogs and notification messages