Fix some HTML and XML validation issues