Minor notification fixes