fixing some persistence stuff