Notification fixes.