minor generalization fixes