- Fix FindBugs warnings