Fix tagging problems for existing instances.