more findbugs warnings fixed