Miscellaneous fixes in async module