Fix issues found by FindBugs