More async changes