Some fixes to dialog forms and notification messages