Fix up entity builder - popping too many levels off stack