Invalid entity types and missing property information fixes