More async improvements