Tags and Wrangling fixes