Corrected some PMD issues