Found issues with PMD and fixed them