Fix persitence errors