Async fixes

Async fixes suitable for stable-2.0