Persist fixes