Fix bugs in backup/restore.