More memory leak fixes...