More link tweaks