Add more async safeguards