Fix method identities not matching for generic declaring types Fix component RPCs declared on generic types