Small findbugs fixes.