FindBugs warnings cleanup.