Various fixes for the entity creation bubbles.