More link fixing