Fixed FindBugs warnings