Small fixes in polymorphic signature