Address FindBugs issues.