Fix some cross-refs