Fix a few more ref leaks.  Backport candidate
3 files changed