findbugs fixes.
Merge origin/master