Minor updates to pass XHTML validation