Default notification fixes