fixes for Snapshot API