More Link location tweaks