Notification and other minor changes