FindBugs warnings fixed