plug some more memory leaks.