Fix API differences from x-new-api branch