Fixed some generics warnings