Forum: Further bad entity fixes