Fix some generics.