Minor fixes
Extended generics