PolymorphicQuerySet and minor fixes