* Fixed some reference leaks