fixes some findBugs issues