Cleaning FindBugs errors