Minor updates to Backup/Restore