Fixes for snapshot tagging