Fixup for snapshots status.

To be squashed after review.