fixup! Improve self-links
fixup! fixup! Improve self-links