Merge "Fixes for snapshots"