SelfLink fixes