Some improvements for async rendering