NXP-14007: Fix some PMD alerts