fixed more from findbugs