async fixes