Snapshot General Fixup