Findbugs fixes

Fix issues listed by *mvn findbugs:findbugs findbugs:gui*