Handle a few more link cases

Change-Id: Ia911fb424c45f99c325188ade9f27ab73bbbba69
Merge "Handle a few more link cases"