Memory fixes.