More link fixes