A couple of memory fixes;