Jeremy Newman : Fix "mismatched tag" XML errors