some cross-reference tweaks