Various findbugs fixes.