more work on findbugs warnings