More async fixes

because I am slow.