Fix notification messages