PMD tweaks.