fix up several disposable issues from code analysis