More corrupted memory fixes