NotificationBundle fixes