A smattering of PMD violations removed