Fixing some mismatched tags