Fix generalizations
Merge branch 'master' into fire