Various tiny fixes exposed by PMD.
Merge pull request #14 from hgschmie/pmd-fixes

Various tiny fixes exposed by PMD.