small fixes for FindBugs