More tweaking to async code