a few more async completion fixes