Fixed async return issues