Findbugs fixes. Mvn clean verify now passes.