Fixing a few FindBugs warnings.