[PDT-5181] Fix more errors caused by api change