a few more findbugs fixes