Fixed more findbugs errors.