findbugs fixes

rollup of some findbugs3.0 hits