More fixes from PMD