Fixed bugs called out by FindBugs in 2b.