Tweaks to clink link flow