Fixed: Some FindBugs results