Small fixes to Tags and Snapshot
Small fixes