- More memory fixes