Fixed some warnings on generics