fix cross-reference in some classes