some model fixes on polymorphic on