More memory management related changes.