Analtyics Snapshot fixes