Minor changes to the entity system.