Additional linking tweaks