*9015* Fix XML linting problems