More memory fixes