Various FindBugs fixes.