some findbugs errors are fixed