persist fixes