Fixed some PMD-warnings.