Various tweaks to snapshots