Fix cross references