Link and route fixes