Address FindBugs warnings

Done.