Fix some cross reference