usage fixes: generics, context