Fixed some generics stuff.