Fixing pmd related issues