async issue fixes