memory: more fixes