Plugged some leaks when using MakeIterator