fixed up some generics warnings