NXP-10414: fix API change errors