Further try to make xcore cross references work