Memory leak fixes finished.