Invalid entity types and missing property information fixes. Re: Dena's notes. Thanks Dena.