Fixes for PMD-reported errors.