Minor changes to validate XHTML