More link-fixing