Snapshot issue fixed.
Sanity check related changes.