Fix notification scenarios