Fixed more findbugs problems.