Address FindBugs errors