Async Related Bug Fixes