Small tweaks to the entity interface