FindBugs sweep.

Quiet down find bugs on some areas of the codebase.  Address a couple glitches find bugs didn't catch.