fixes for embedding entities in other entities