Minor fixes for FindBugs