More PMD violations addressed