Address FindBugs complaints