Clean up some more memory leaks.