Fixed issues found in FindBugs