Out-of-memory fixes