PMD errors were removed. Site reporting error fixes