Fix up polymorphic state