Fix generics in fields