PMD improvements.