Fixed some more findbugs errors.