small persistence fixes