Fixed 2 PMD problems