some more per-class changes