PMD fixes
OPAL-2055