Clean some bugs reported by FindBugs in Eclipse