Couple more HTML entity fixes