reduced two findBugs warnings