more async fixes