Fixed some of the instances. Polymorphism may not be available in this form, because of the partial nature of updates.