...and more link fixes