Fix FindBugs findings