PMD critical violations addressed