Some persistence fixes