findbugs improvements