Fixing and enhancing links