Fix more issues for new v3 API