Further fixes to HTML entities