Merge "Correct errors in links"