Improve self-links