More changes to handle snapshots (manual backups via AT)