Tweaks to links and whatnot