Expect async fixes