Fixed some cross-link issues