Unify some cross-references