Improve compatibility for more links