Fixed generics in several operations!