Fixed some generics warnings.