persistence fixes