Some tag and data fixes