Notification and popup fixes