Fix some issues with tags.