another part of findbugs warnings fixes