And more link fixes