fix a bunch of tag references