Fix notification addresses