More memory fixes.