More findbugs fixes.