Fixed Async related issues.