Fixing tagging issues.