Fix XML errors introduced by 5ad9395659