Fix FindBugs warnings
fix FindBugs issues