fix problems found by findBugs