Shore up some more reference leaks