More findbugs errors fixed.
More fixes.