Adding a few tag backwards compatibility changes
More v6 backwards compatibility changes