small fixes found by FindBugs