More findbugs cleanup

: