Add new notification fixes