FIXES TO LINKS