Async task
Async fixes