Fixing some tags