Memory fixes: