Fixed backup/restore issues from merge.