More fixes on links between nodes