More team link tweaks