[FINDBUGS] Fixed results from FindBugs