Fixing some missing / incorrect / duplicate links