Fixing persistence issues.