fixing findbugs bugs