NXP-9574: fixes to build correctly