Add some generics parameters to remove warnings
28 files changed