fix build error by fixing several findbugs errors