fixes for FindBugs