a few small changes around async handlers