Fixes up some tags