Fixing stuff reported by PMD