Fix up some generics