Fixes for Async caller