More tweaks on linking