Changes to HTML entities, USPC class, etc.