Finally fix links