Corrected PMD errors