Fix persistence issues.