Fix persist issues