Fix debug backup/restore methods