changes based on FindBugs output.