more findbugs fixes