Shore up some more reference leaks
Merge pull request #56 from CruGlobal/model-changes

Shore up some more reference leaks