Clean bugs found by FindBugs