Give small improvements to Generics