More findbugs cleanup
:
Merge pull request #1659 from pveentjer/cleanup/field-package-protected

More findbugs cleanup