More memory leak fix.