Minor updates to HTML parsing