notification fixes