Fix backup/restore issues.