Fix PMD warnings