Fixed some FindBugs warnings