more findbugs fixes
Merge pull request #1661 from pveentjer/findbugs

more findbugs fixes