Snapshot page fixes