More notification fixes