Fixes for async.

Signed-off-by: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>