fix issues reported by FindBugs
fix debugger problem (reported by findbugs)