Minor improvements for HTML and XML.