Various findbugs related fixes.