Further link fixes