Notification bug fixes