Resolve FindBugs warnings