fixed some generics issues