Minor change to keep FindBugs happy.
Some minor changes.