Address FindBugs warnings

Functional change.