Fixing findbugs problems.