Fixing broken links (the running gag..)