Fix issues in existing entity classes

No match.