fixing some FindBugs warnings