Async fixes