Some more notification fixes