Fix issues pointed out by the FindBugs plugin