Improve link compatibility