Persistence fixes