Adjust for async listen changes