Repairs PMD reported bugs