Memory fixes
Redpointing here/