Minor fixes for PMD