Fix types with wildcard