Final links fix