fix issues reported by FindBugs