Small fixes to volumes and snapshots