Minor changes to WaitForm and Notification