Progress on removing memory leaks