Few more link fixes