fix generics on some methods