FindBugs errors fixed