Fixed findbugs problems.