Address FindBugs warnings