Convert some controllers to the async way