Some minor changes for a new tag